java,wizards: remove unused parameters

Change-Id: I13f0c7afca233cc0ff6692f8fb442a80c4208d20

35 files changed, 105 insertions, 119 deletions

diff --git a/wizards/com/sun/star/wizards/common/InvalidQueryException.java b/wizards/com/sun/star/wizards/common/InvalidQueryException.java
index efe21aa68e26..56a54ebd7ae7 100644
--- a/wizards/com/sun/star/wizards/common/InvalidQueryException.java
+++ b/wizards/com/sun/star/wizards/common/InvalidQueryException.java
@@ -25,13 +25,13 @@ public class InvalidQueryException extends java.lang.Throwable
     public InvalidQueryException(XMultiServiceFactory xMSF, String sCommand)
     {
         final int RID_REPORT = 2400;
-        SystemDialog.showErrorBox(xMSF, "ReportWizard", "dbw", RID_REPORT + 65, "<STATEMENT>", sCommand); // Querycreationnotpossible
+        SystemDialog.showErrorBox(xMSF, "dbw", RID_REPORT + 65, "<STATEMENT>", sCommand); // Querycreationnotpossible
     }
     // TODO don't show messages in Exceptions
     public InvalidQueryException(XMultiServiceFactory xMSF, String sCommand, Throwable cause)
     {
         super(cause);
         final int RID_REPORT = 2400;
-        SystemDialog.showErrorBox(xMSF, "ReportWizard", "dbw", RID_REPORT + 65, "<STATEMENT>", sCommand); // Querycreationnotpossible
+        SystemDialog.showErrorBox(xMSF, "dbw", RID_REPORT + 65, "<STATEMENT>", sCommand); // Querycreationnotpossible
     }
 }
diff --git a/wizards/com/sun/star/wizards/common/NoValidPathException.java b/wizards/com/sun/star/wizards/common/NoValidPathException.java
index 074b8f52698d..2881a79e7a06 100644
--- a/wizards/com/sun/star/wizards/common/NoValidPathException.java
+++ b/wizards/com/sun/star/wizards/common/NoValidPathException.java
@@ -28,7 +28,7 @@ public class NoValidPathException extends Exception
         // TODO: NEVER open a dialog in an exception
         if (xMSF != null)
         {
-            SystemDialog.showErrorBox(xMSF, "dbwizres", "dbw", 521); // OfficePathnotavailable
+            SystemDialog.showErrorBox(xMSF, "dbw", 521); // OfficePathnotavailable
         }
     }
 
@@ -38,7 +38,7 @@ public class NoValidPathException extends Exception
         // TODO: NEVER open a dialog in an exception
         if (xMSF != null)
         {
-            SystemDialog.showErrorBox(xMSF, "dbwizres", "dbw", 521); // OfficePathnotavailable
+            SystemDialog.showErrorBox(xMSF, "dbw", 521); // OfficePathnotavailable
         }
     }
 }
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java
index e5fefd498b3d..ac9168482212 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.java
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.java
@@ -32,7 +32,7 @@ public class SystemDialog
 
     XFilterManager xFilterManager;
 
-    public static int showErrorBox(XMultiServiceFactory xMSF, String ResName, String ResPrefix, int ResID, String AddTag, String AddString)
+    public static int showErrorBox(XMultiServiceFactory xMSF, String ResPrefix, int ResID, String AddTag, String AddString)
     {
         Resource oResource;
         String ProductName = Configuration.getProductName(xMSF);
@@ -44,7 +44,7 @@ public class SystemDialog
         return SystemDialog.showMessageBox(xMSF, "ErrorBox", com.sun.star.awt.VclWindowPeerAttribute.OK, sErrorMessage);
     }
 
-    public static int showErrorBox(XMultiServiceFactory xMSF, String ResName, String ResPrefix, int ResID)
+    public static int showErrorBox(XMultiServiceFactory xMSF, String ResPrefix, int ResID)
     {
         Resource oResource;
         String ProductName = Configuration.getProductName(xMSF);
diff --git a/wizards/com/sun/star/wizards/db/BlindtextCreator.java b/wizards/com/sun/star/wizards/db/BlindtextCreator.java
index 96208c89e6a3..6f532f188d41 100644
--- a/wizards/com/sun/star/wizards/db/BlindtextCreator.java
+++ b/wizards/com/sun/star/wizards/db/BlindtextCreator.java
@@ -31,28 +31,28 @@ public class BlindtextCreator
         String BlindTextString = PropertyNames.EMPTY_STRING;
         if (bIsGroupTable)
         {
-            return getBlindTextString(FieldTitle, FieldWidth, FieldWidth);
+            return getBlindTextString(FieldTitle, FieldWidth);
         }
         int MaxFieldCount = getMaxFieldCount(bIsCurLandscape);
         if (_RecordFieldNames.length <= 2 * MaxFieldCount)
         {
             if (_RecordFieldNames.length <= MaxFieldCount)
             {
-                BlindTextString = getBlindTextString(FieldTitle, FieldWidth, FieldWidth);
+                BlindTextString = getBlindTextString(FieldTitle, FieldWidth);
             }
             else
             {
-                BlindTextString = getBlindTextString(FieldTitle, FieldWidth, (int) (0.5 * FieldWidth));
+                BlindTextString = getBlindTextString(FieldTitle, (int) (0.5 * FieldWidth));
             }
         }
         else
         {
-            BlindTextString = getBlindTextString(FieldTitle, FieldWidth, (int) 1.1 * FieldTitle.length());
+            BlindTextString = getBlindTextString(FieldTitle, (int) 1.1 * FieldTitle.length());
         }
         return BlindTextString;
     }
 
-    public static String getBlindTextString(String FieldTitle, int FieldWidth, int MaxWidth)
+    public static String getBlindTextString(String FieldTitle, int MaxWidth)
     {
         String[] BlindTextArray = JavaTools.ArrayoutofString(BlindText, PropertyNames.SPACE);
         String PartBlindText = BlindTextArray[0];
diff --git a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
index 4797c5af505d..3fdbf1228c3b 100644
--- a/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
+++ b/wizards/com/sun/star/wizards/db/ColumnPropertySet.java
@@ -61,7 +61,7 @@ public class ColumnPropertySet
             {
                 xPropertySet.setPropertyValue("Precision", precision);
             }
-            setType(nType, sTypeName, precision);
+            setType(sTypeName, precision);
             for (int i = 0; i < _aNewColPropertyValues.length; i++)
             {
                 String sPropName = _aNewColPropertyValues[i].Name;
@@ -96,7 +96,7 @@ public class ColumnPropertySet
         assignPropertyValues(null /* dont change the name */, _aNewColPropertyValues, _bsetDefaultProperties);
     }
 
-    private void setType(int _nType, String _sTypeName, Integer precision)
+    private void setType(String _sTypeName, Integer precision)
     {
         if (_sTypeName.equals(PropertyNames.EMPTY_STRING))
         {
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java
index 9e7797c7b767..607760fb35bd 100644
--- a/wizards/com/sun/star/wizards/db/CommandMetaData.java
+++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java
@@ -70,7 +70,7 @@ public class CommandMetaData extends DBMetaData
         super(xMSF);
     }
 
-    public void initializeFieldColumns(boolean _bgetDefaultValue, String _CommandName, String[] _FieldNames)
+    public void initializeFieldColumns(String _CommandName, String[] _FieldNames)
     {
         this.setCommandName(_CommandName);
         FieldColumns = new FieldColumn[_FieldNames.length];
@@ -259,7 +259,7 @@ public class CommandMetaData extends DBMetaData
         throw new com.sun.star.uno.RuntimeException();
     }
 
-    public boolean getFieldNamesOfCommand(String _commandname, int _commandtype, boolean _bAppendMode)
+    public boolean getFieldNamesOfCommand(String _commandname, int _commandtype)
     {
         try
         {
diff --git a/wizards/com/sun/star/wizards/db/FieldColumn.java b/wizards/com/sun/star/wizards/db/FieldColumn.java
index c5fcfc2bd6e2..aae60495b43e 100644
--- a/wizards/com/sun/star/wizards/db/FieldColumn.java
+++ b/wizards/com/sun/star/wizards/db/FieldColumn.java
@@ -387,7 +387,7 @@ public class FieldColumn
 
             case DataType.VARCHAR: // ==  12;
             case DataType.LONGVARCHAR: // ==  -1;
-                DefaultValue = BlindtextCreator.getBlindTextString(FieldTitle, FieldWidth, FieldWidth);
+                DefaultValue = BlindtextCreator.getBlindTextString(FieldTitle, FieldWidth);
                 break;
 
             case DataType.NUMERIC: // ==   2;
diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java
index 31b7efd54a5f..fb48d02fb7c0 100644
--- a/wizards/com/sun/star/wizards/db/QueryMetaData.java
+++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java
@@ -171,7 +171,7 @@ public class QueryMetaData extends CommandMetaData
 
 
 
-    public void initializeFieldTitleSet(boolean _bAppendMode)
+    public void initializeFieldTitleSet()
     {
         try
         {
diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java
index 10cc6345f68f..d28db51b6abb 100644
--- a/wizards/com/sun/star/wizards/db/TableDescriptor.java
+++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java
@@ -226,7 +226,7 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
      * @param _tablename is made unique if necessary
      * @return true or false to indicate successful creation or not
      */
-    public boolean createTable(String _catalogname, String _schemaname, String _tablename, String[] _fieldnames)
+    public boolean createTable(String _catalogname, String _schemaname, String _tablename)
     {
         boolean breturn = true;
         try
@@ -341,11 +341,11 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
         return false;
     }
 
-    public boolean createTable(String _catalogname, String _schemaname, String _tablename, String[] _keycolumnnames, boolean _bAutoincrementation, String[] _fieldnames)
+    public boolean createTable(String _catalogname, String _schemaname, String _tablename, String[] _keycolumnnames, boolean _bAutoincrementation)
     {
         if (createPrimaryKeys(_keycolumnnames, _bAutoincrementation))
         {
-            return createTable(_catalogname, _schemaname, _tablename, _fieldnames);
+            return createTable(_catalogname, _schemaname, _tablename);
         }
         return false;
     }
diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java
index db30c1669cc2..d930b6724a64 100644
--- a/wizards/com/sun/star/wizards/db/TypeInspector.java
+++ b/wizards/com/sun/star/wizards/db/TypeInspector.java
@@ -51,7 +51,7 @@ public class TypeInspector
     {
         public boolean bisAutoIncrementable;
 
-        public TypeInfo(int _nDataType, String _sDataTypeName, boolean _bisAutoIncrementable)
+        public TypeInfo(boolean _bisAutoIncrementable)
         {
             bisAutoIncrementable = _bisAutoIncrementable;
         }
@@ -388,7 +388,7 @@ public class TypeInspector
                 {
                     if (this.bisAutoIncrementableInfos[i])
                     {
-                        return new TypeInfo(nDataType, this.sDataTypeNames[i], true);
+                        return new TypeInfo(true);
                     }
                     startindex = i + 1;
                 }
@@ -397,6 +397,6 @@ public class TypeInspector
         }
         // As Autoincrementation is not supported for any numeric datatype we take the first available numeric Type;
         nDataType = convertDataType(DataType.INTEGER);
-        return new TypeInfo(nDataType, getDefaultTypeName(nDataType, null), false);
+        return new TypeInfo(false);
     }
 }
diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java
index 64ed3010e218..a7bfb139a0ed 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -62,16 +62,16 @@ public class Control extends Shape
     {
         super(_oFormHandler, _aPoint, _aSize);
         xFormName = _xFormName;
-        createControl(_icontroltype, _aPoint, _aSize, null, _FieldName);
+        createControl(_icontroltype, null, _FieldName);
     }
 
     public Control(FormHandler _oFormHandler, int _icontroltype, Point _aPoint, Size _aSize)
     {
         super(_oFormHandler, _aPoint, _aSize);
-        createControl(_icontroltype, _aPoint, _aSize, null, null);
+        createControl(_icontroltype, null, null);
     }
 
-    public void createControl(int _icontroltype, Point _aPoint, Size _aSize, XShapes _xGroupShapes, String _FieldName)
+    public void createControl(int _icontroltype, XShapes _xGroupShapes, String _FieldName)
     {
         try
         {
diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java
index 340b7d446be5..39aaa57f26ff 100644
--- a/wizards/com/sun/star/wizards/document/FormHandler.java
+++ b/wizards/com/sun/star/wizards/document/FormHandler.java
@@ -118,29 +118,29 @@ public class FormHandler
         sModelServices[SOIMAGECONTROL] = "com.sun.star.form.component.DatabaseImageControl";
 
         oControlData = new ControlData[22];
-        oControlData[0] = createControlData(DataType.BIT,          SOCHECKBOX, CHECKBOX, CHECKBOX, false);
-        oControlData[1] = createControlData(DataType.BOOLEAN,      SOCHECKBOX, CHECKBOX, CHECKBOX, false);
-        oControlData[2] = createControlData(DataType.TINYINT,      SONUMERICCONTROL, FORMATTEDFIELD, FORMATTEDFIELD, false);
-        oControlData[3] = createControlData(DataType.SMALLINT,     SONUMERICCONTROL, FORMATTEDFIELD, FORMATTEDFIELD, false);
-        oControlData[4] = createControlData(DataType.INTEGER,      SONUMERICCONTROL, FORMATTEDFIELD, FORMATTEDFIELD, false);
-        oControlData[5] = createControlData(DataType.BIGINT,       SONUMERICCONTROL, FORMATTEDFIELD, FORMATTEDFIELD, false);
-        oControlData[6] = createControlData(DataType.FLOAT,        SONUMERICCONTROL, FORMATTEDFIELD, FORMATTEDFIELD, false);
-        oControlData[7] = createControlData(DataType.REAL,         SONUMERICCONTROL, FORMATTEDFIELD, FORMATTEDFIELD, false);
-        oControlData[8] = createControlData(DataType.DOUBLE,       SONUMERICCONTROL, FORMATTEDFIELD, FORMATTEDFIELD, false);
-        oControlData[9] = createControlData(DataType.NUMERIC,      SONUMERICCONTROL, FORMATTEDFIELD, FORMATTEDFIELD, false);
-        oControlData[10] = createControlData(DataType.DECIMAL,     SONUMERICCONTROL, FORMATTEDFIELD, FORMATTEDFIELD, false);
-        oControlData[11] = createControlData(DataType.CHAR,        SOTEXTBOX, TEXTFIELD, TEXTFIELD, false);
-        oControlData[12] = createControlData(DataType.VARCHAR,     SOTEXTBOX, TEXTFIELD, TEXTFIELD, true);
-        oControlData[13] = createControlData(DataType.LONGVARCHAR, SOTEXTBOX, TEXTFIELD, TEXTFIELD, true);
-        oControlData[14] = createControlData(DataType.DATE,        SODATECONTROL, DATEFIELD, DATEFIELD, false);
-        oControlData[15] = createControlData(DataType.TIME,        SOTIMECONTROL, TIMEFIELD, TIMEFIELD, false);
-        oControlData[16] = createControlData(DataType.TIMESTAMP,   SODATECONTROL, DATEFIELD, TEXTFIELD, false);
-        oControlData[17] = createControlData(DataType.BINARY,      SOIMAGECONTROL, IMAGECONTROL, TEXTFIELD, false);
-        oControlData[18] = createControlData(DataType.VARBINARY,   SOIMAGECONTROL, IMAGECONTROL, TEXTFIELD, false);
-        oControlData[19] = createControlData(DataType.LONGVARBINARY, SOIMAGECONTROL, IMAGECONTROL, TEXTFIELD, false);
-        oControlData[20] = createControlData(DataType.BLOB,        SOIMAGECONTROL, IMAGECONTROL, TEXTFIELD, false);
-
-        oControlData[21] = createControlData(DataType.OTHER,       SOIMAGECONTROL, IMAGECONTROL, TEXTFIELD, false);
+        oControlData[0] = createControlData(DataType.BIT,          SOCHECKBOX, CHECKBOX);
+        oControlData[1] = createControlData(DataType.BOOLEAN,      SOCHECKBOX, CHECKBOX);
+        oControlData[2] = createControlData(DataType.TINYINT,      SONUMERICCONTROL, FORMATTEDFIELD);
+        oControlData[3] = createControlData(DataType.SMALLINT,     SONUMERICCONTROL, FORMATTEDFIELD);
+        oControlData[4] = createControlData(DataType.INTEGER,      SONUMERICCONTROL, FORMATTEDFIELD);
+        oControlData[5] = createControlData(DataType.BIGINT,       SONUMERICCONTROL, FORMATTEDFIELD);
+        oControlData[6] = createControlData(DataType.FLOAT,        SONUMERICCONTROL, FORMATTEDFIELD);
+        oControlData[7] = createControlData(DataType.REAL,         SONUMERICCONTROL, FORMATTEDFIELD);
+        oControlData[8] = createControlData(DataType.DOUBLE,       SONUMERICCONTROL, FORMATTEDFIELD);
+        oControlData[9] = createControlData(DataType.NUMERIC,      SONUMERICCONTROL, FORMATTEDFIELD);
+        oControlData[10] = createControlData(DataType.DECIMAL,     SONUMERICCONTROL, FORMATTEDFIELD);
+        oControlData[11] = createControlData(DataType.CHAR,        SOTEXTBOX, TEXTFIELD);
+        oControlData[12] = createControlData(DataType.VARCHAR,     SOTEXTBOX, TEXTFIELD);
+        oControlData[13] = createControlData(DataType.LONGVARCHAR, SOTEXTBOX, TEXTFIELD);
+        oControlData[14] = createControlData(DataType.DATE,        SODATECONTROL, DATEFIELD);
+        oControlData[15] = createControlData(DataType.TIME,        SOTIMECONTROL, TIMEFIELD);
+        oControlData[16] = createControlData(DataType.TIMESTAMP,   SODATECONTROL, TEXTFIELD);
+        oControlData[17] = createControlData(DataType.BINARY,      SOIMAGECONTROL, TEXTFIELD);
+        oControlData[18] = createControlData(DataType.VARBINARY,   SOIMAGECONTROL, TEXTFIELD);
+        oControlData[19] = createControlData(DataType.LONGVARBINARY, SOIMAGECONTROL, TEXTFIELD);
+        oControlData[20] = createControlData(DataType.BLOB,        SOIMAGECONTROL, TEXTFIELD);
+
+        oControlData[21] = createControlData(DataType.OTHER,       SOIMAGECONTROL, TEXTFIELD);
     }
 
     public int getControlType(int _fieldtype)
@@ -170,7 +170,7 @@ public class FormHandler
         xDrawPage.remove(oTextControl.xShape);
     }
 
-    public ControlData createControlData(int _datatype, int _controltype, String _scontrolservicename, String _gridcolumnname, boolean _bIsTextControl)
+    public ControlData createControlData(int _datatype, int _controltype, String _gridcolumnname)
     {
         ControlData curControlData = new ControlData();
         curControlData.DataType = _datatype;
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)
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java
index 762876fc31fb..00c39ba84cf2 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -72,7 +72,7 @@ public class QueryWizard extends DatabaseObjectWizard
     public QueryWizard(XMultiServiceFactory xMSF, PropertyValue[] i_wizardContext)
     {
         super(xMSF, 40970, i_wizardContext);
-        addResourceHandler("QueryWizard", "dbw");
+        addResourceHandler("dbw");
         m_DBMetaData = new QuerySummary(xMSF, m_oResource);
     }
 
@@ -143,7 +143,7 @@ public class QueryWizard extends DatabaseObjectWizard
         return m_createdQuery;
     }
 
-    public void enableRoadmapItems(String[] _FieldNames, boolean _bEnabled)
+    public void enableRoadmapItems(boolean _bEnabled)
     {
         try
         {
@@ -235,7 +235,7 @@ public class QueryWizard extends DatabaseObjectWizard
             m_DBCommandFieldSelectio.setAppendMode(true);
             m_DBCommandFieldSelectio.addFieldSelectionListener(new FieldSelectionListener());
             m_sortingComponent = new SortingComponent(this, SOSORTING_PAGE, 95, 27, 210, 40865);
-            m_filterComponent = new FilterComponent(this, xMSF, SOFILTER_PAGE, 97, 27, 3, m_DBMetaData, 40878);
+            m_filterComponent = new FilterComponent(this, SOFILTER_PAGE, 97, 27, 3, m_DBMetaData, 40878);
             m_filterComponent.addNumberFormats();
 
             if (m_DBMetaData.xDBMetaData.supportsCoreSQLGrammar())
@@ -246,7 +246,7 @@ public class QueryWizard extends DatabaseObjectWizard
             {
                 m_groupFieldSelection = new FieldSelection(this, SOGROUPSELECTION_PAGE, 95, 27, 210, 150, reslblFields, this.reslblGroupBy, 40915, false);
                 m_groupFieldSelection.addFieldSelectionListener(new FieldSelectionListener());
-                m_groupFilterComponent = new FilterComponent(this, xMSF, SOGROUPFILTER_PAGE, 97, 27, 3, m_DBMetaData, 40923);
+                m_groupFilterComponent = new FilterComponent(this, SOGROUPFILTER_PAGE, 97, 27, 3, m_DBMetaData, 40923);
             }
             m_titlesComponent = new TitlesComponent(this, SOTITLES_PAGE, 97, 37, 207, 7, reslblFieldHeader, reslblAliasHeader, 40940);
             m_finalizer = new Finalizer(this, m_DBMetaData);
@@ -328,7 +328,7 @@ public class QueryWizard extends DatabaseObjectWizard
         {
             case SOFIELDSELECTION_PAGE:
                 m_DBMetaData.reorderFieldColumns(m_DBCommandFieldSelectio.getSelectedFieldNames());
-                m_DBMetaData.initializeFieldTitleSet(true);
+                m_DBMetaData.initializeFieldTitleSet();
                 m_DBMetaData.setNumericFields();
                 searchForOutdatedFields();
                 break;
@@ -391,7 +391,7 @@ public class QueryWizard extends DatabaseObjectWizard
         boolean bEnabled = NewItems.length > 0;
         setControlProperty("btnWizardNext", PropertyNames.PROPERTY_ENABLED, bEnabled);
         setControlProperty("btnWizardFinish", PropertyNames.PROPERTY_ENABLED, bEnabled);
-        enableRoadmapItems(NewItems, bEnabled); // Note: Performancewise this could be improved
+        enableRoadmapItems(bEnabled); // Note: Performancewise this could be improved
     }
 
     public class FieldSelectionListener implements com.sun.star.wizards.ui.XFieldSelectionListener
diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java
index a3fd4c158b37..0785ff3de2e3 100644
--- a/wizards/com/sun/star/wizards/report/DBColumn.java
+++ b/wizards/com/sun/star/wizards/report/DBColumn.java
@@ -126,7 +126,7 @@ public class DBColumn
         return false;
     }
 
-    public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, String _FieldName, int GroupIndex, String TableName, DBColumn OldDBColumn) {
+    public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, String _FieldName, String TableName, DBColumn OldDBColumn) {
         this.oTextTableHandler = _oTextTableHandler;
         this.CurDBMetaData = _CurDBMetaData;
         CurDBField = CurDBMetaData.getFieldColumnByDisplayName(_FieldName);
@@ -142,7 +142,7 @@ public class DBColumn
         initializeNumberFormat();
     }
 
-    public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, String _FieldName, int GroupIndex, String TableName) throws Exception
+    public DBColumn(TextTableHandler _oTextTableHandler, RecordParser _CurDBMetaData, String _FieldName, String TableName) throws Exception
     {
         this.oTextTableHandler = _oTextTableHandler;
         this.CurDBMetaData = _CurDBMetaData;
diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java
index 1ce0bfd53c3f..92a63d65e836 100644
--- a/wizards/com/sun/star/wizards/report/Dataimport.java
+++ b/wizards/com/sun/star/wizards/report/Dataimport.java
@@ -42,7 +42,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
     public Dataimport(XMultiServiceFactory _xMSF)
     {
         super(_xMSF);
-        super.addResourceHandler("ReportWizard", "dbw");
+        super.addResourceHandler("dbw");
         sProgressDBConnection = m_oResource.getResText(UIConsts.RID_DB_COMMON + 34);
         sProgressDataImport = m_oResource.getResText(UIConsts.RID_REPORT + 67);
         sProgressTitle = m_oResource.getResText(UIConsts.RID_REPORT + 62);
@@ -146,7 +146,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
         }
     }
 
-    public void importReportData(final XMultiServiceFactory _xMSF, final Dataimport _CurDataimport, IReportDocument _CurReportDocument, PropertyValue[] _properties)
+    public void importReportData(final XMultiServiceFactory _xMSF, PropertyValue[] _properties)
     {
         if (CurReportDocument.reconnectToDatabase(_xMSF, _properties))
         {
@@ -164,6 +164,6 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
     {
         CurReportDocument = ReportTextImplementation.create( xMSF, i_documentUI, _textDocument, m_oResource );
         showProgressDisplay(true);
-        importReportData(xMSF, this, CurReportDocument, properties);
+        importReportData(xMSF, properties);
     }
 }
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index c4c3813a3f38..3484975b985b 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -89,7 +89,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
 
     private void lateInit(Resource oResource, RecordParser _aRecordParser)
     {
-        oTextTableHandler = new TextTableHandler(xMSFDoc, xTextDocument);
+        oTextTableHandler = new TextTableHandler(xTextDocument);
         oTextSectionHandler = new TextSectionHandler(xMSFDoc, xTextDocument);
         oFormHandler = new FormHandler(xMSFDoc, xTextDocument);
         oTextStyleHandler = new TextStyleHandler(xTextDocument);
@@ -214,8 +214,8 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
                 Helper.setUnoPropertyValue(ReportPageStyle, SIZE, oNewSize);
                 Helper.setUnoPropertyValue(FirstPageStyle, ISLANDSCAPE, bNewLandscape);
                 Helper.setUnoPropertyValue(FirstPageStyle, SIZE, oNewSize);
-                int iLeftMargin = AnyConverter.toInt(Helper.getUnoPropertyValue(ReportPageStyle, "LeftMargin"));
-                int iRightMargin = AnyConverter.toInt(Helper.getUnoPropertyValue(ReportPageStyle, "RightMargin"));
+                AnyConverter.toInt(Helper.getUnoPropertyValue(ReportPageStyle, "LeftMargin"));
+                AnyConverter.toInt(Helper.getUnoPropertyValue(ReportPageStyle, "RightMargin"));
                 if (CurRecordTable != null)
                 {
                     CurRecordTable.adjustOptimalTableWidths(xMSF, oViewHandler);
@@ -251,7 +251,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
             }
             for (i = 0; i < GroupCount; i++)
             {
-                CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurDBMetaData.GroupFieldNames[i], i, TBLGROUPSECTION + (i + 1));
+                CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurDBMetaData.GroupFieldNames[i], TBLGROUPSECTION + (i + 1));
                 CurDBColumn.formatValueCell();
                 DBColumnsVector.set(i, CurDBColumn);
                 replaceFieldValueInGroupTable(CurDBColumn, i);
@@ -315,7 +315,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
         {
             TableName = TBLGROUPSECTION + Integer.toString(i + 1);
             OldDBColumn = DBColumnsVector.get(i);
-            CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, SelGroupNames[i], i, TableName, OldDBColumn);
+            CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, SelGroupNames[i], TableName, OldDBColumn);
             CurDBColumn.formatValueCell();
             DBColumnsVector.set(i, CurDBColumn);
             CurDBColumn.insertColumnData(oTextFieldHandler, this.bIsCurLandscape);
@@ -374,7 +374,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
         }
     }
 
-    public boolean addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount)
+    public boolean addGroupNametoDocument(String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount)
     {
         DBColumn CurDBColumn = null;
         int GroupCount = GroupFieldVector.size();
@@ -388,7 +388,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
             {
                 String sPath = FileAccess.getPathFromList(xMSF, ReportPath, "cnt-default.ott");
                 oTextSectionHandler.insertTextSection(GROUPSECTION + GroupCount, sPath, GroupCount == 1);
-                CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurFieldColumn.getFieldName(), GroupCount - 1, TBLGROUPSECTION + (GroupCount));
+                CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurFieldColumn.getFieldName(), TBLGROUPSECTION + (GroupCount));
                 CurDBColumn.formatValueCell();
                 DBColumnsVector.add(CurDBColumn);
                 replaceFieldValueInGroupTable(CurDBColumn, GroupCount - 1);
@@ -449,7 +449,7 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
             {
                 if (i < CurDBMetaData.GroupFieldNames.length)
                 {
-                    CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurDBMetaData.GroupFieldNames[i], i, COPYOFTBLGROUPSECTION + (i + 1));
+                    CurDBColumn = new DBColumn(oTextTableHandler, CurDBMetaData, CurDBMetaData.GroupFieldNames[i], COPYOFTBLGROUPSECTION + (i + 1));
                 }
                 else
                 {
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index 2dea1abfbe58..3527d7ddd7b8 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -473,7 +473,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
 
     public boolean liveupdate_addGroupNametoDocument(String[] GroupNames, String CurGroupTitle, ArrayList<String> GroupFieldVector, ArrayList<String> ReportPath, int iSelCount)
     {
-        return getDoc().addGroupNametoDocument(GroupNames, CurGroupTitle, GroupFieldVector, ReportPath, iSelCount);
+        return getDoc().addGroupNametoDocument(CurGroupTitle, GroupFieldVector, ReportPath, iSelCount);
     }
 
     public void refreshGroupFields(String[] _sNewNames)
diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java b/wizards/com/sun/star/wizards/report/ReportWizard.java
index 3c21bff360c6..5a68433ee2fc 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -84,7 +84,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
     public ReportWizard(XMultiServiceFactory i_serviceFactory, final PropertyValue[] i_wizardContext)
     {
         super(i_serviceFactory, 34320, i_wizardContext);
-        super.addResourceHandler("Report Wizard", "dbw");
+        super.addResourceHandler("dbw");
         if (getReportResources(false))
         {
             Helper.setUnoPropertyValues(xDialogModel,
@@ -144,7 +144,7 @@ public class ReportWizard extends DatabaseObjectWizard implements XTextListener
                 String[][] aSortFieldNames = m_reportDocument.getRecordParser().getSortFieldNames();
                 CurSortingComponent.initialize(aFieldNames2, aSortFieldNames);
                 int nLength = m_reportDocument.getRecordParser().GroupFieldNames.length;
-                CurSortingComponent.setReadOnlyUntil(nLength, false);
+                CurSortingComponent.setReadOnlyUntil(nLength);
                 break;
 
             case SOTEMPLATEPAGE:
diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java
index d47b868c46bf..42d118616fca 100644
--- a/wizards/com/sun/star/wizards/table/FieldFormatter.java
+++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java
@@ -54,7 +54,7 @@ public class FieldFormatter implements XItemListener
     String suntitled;
     Integer IFieldFormatStep;
 
-    public FieldFormatter(TableWizard _CurUnoDialog, TableDescriptor _curTableDescriptor)
+    public FieldFormatter(TableWizard _CurUnoDialog)
     {
         this.CurUnoDialog = _CurUnoDialog;
         curtabindex = (short) (TableWizard.SOFIELDSFORMATPAGE * 100);
diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
index d8fb8ee9ea88..050e5046a549 100644
--- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
+++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java
@@ -418,7 +418,7 @@ public class PrimaryKeyHandler implements XFieldSelectionListener
         Helper.setUnoPropertyValue(UnoDialog.getModel(chkApplyAutoValueExisting), PropertyNames.PROPERTY_ENABLED, Boolean.valueOf(bdoenableAutoValueCheckBox));
     }
 
-    public String[] getPrimaryKeyFields(TableDescriptor _curtabledescriptor)
+    public String[] getPrimaryKeyFields()
     {
         if (chkcreatePrimaryKey.getState() == 0)
         {
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java
index 3dd4a3336491..8ece17c023e8 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -62,7 +62,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
     public TableWizard( XMultiServiceFactory xMSF, PropertyValue[] i_wizardContext )
     {
         super( xMSF, 41200, i_wizardContext );
-        super.addResourceHandler("TableWizard", "dbw");
+        super.addResourceHandler("dbw");
         String sTitle = m_oResource.getResText(UIConsts.RID_TABLE + 1);
         Helper.setUnoPropertyValues(xDialogModel,
                 new String[]
@@ -234,7 +234,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
     public void buildSteps()
     {
         curScenarioSelector = new ScenarioSelector(this, this.curTableDescriptor, slblFields, slblSelFields);
-        curFieldFormatter = new FieldFormatter(this, curTableDescriptor);
+        curFieldFormatter = new FieldFormatter(this);
         if ( this.curTableDescriptor.supportsPrimaryKeys() )
         {
             curPrimaryKeyHandler = new PrimaryKeyHandler(this, curTableDescriptor);
@@ -251,20 +251,20 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
         String catalogname = curFinalizer.getCatalogName();
         if (curTableDescriptor.supportsPrimaryKeys())
         {
-            String[] keyfieldnames = curPrimaryKeyHandler.getPrimaryKeyFields(curTableDescriptor);
+            String[] keyfieldnames = curPrimaryKeyHandler.getPrimaryKeyFields();
             if (keyfieldnames != null)
             {
                 if (keyfieldnames.length > 0)
                 {
                     boolean bIsAutoIncrement = curPrimaryKeyHandler.isAutoIncremented();
-                    bIsSuccessfull = curTableDescriptor.createTable(catalogname, schemaname, tablename, keyfieldnames, bIsAutoIncrement, curScenarioSelector.getSelectedFieldNames());
+                    bIsSuccessfull = curTableDescriptor.createTable(catalogname, schemaname, tablename, keyfieldnames, bIsAutoIncrement);
                     bTableCreated = true;
                 }
             }
         }
         if (!bTableCreated)
         {
-            bIsSuccessfull = curTableDescriptor.createTable(catalogname, schemaname, tablename, curScenarioSelector.getSelectedFieldNames());
+            bIsSuccessfull = curTableDescriptor.createTable(catalogname, schemaname, tablename);
         }
         if ((!bIsSuccessfull) && (curPrimaryKeyHandler.isAutomaticMode()))
         {
diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java
index 5ee1b07e8261..94f7da83424e 100644
--- a/wizards/com/sun/star/wizards/text/TextTableHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java
@@ -46,7 +46,7 @@ public class TextTableHandler
     private NumberFormatter oNumberFormatter;
 
     /** Creates a new instance of TextTableHandler */
-    public TextTableHandler(XMultiServiceFactory xMSF, XTextDocument xTextDocument)
+    public TextTableHandler(XTextDocument xTextDocument)
     {
         try
         {
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 0b2743441d9c..458868357952 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -58,7 +58,7 @@ public class AggregateComponent extends ControlScroller
     /** Creates a new instance of AggrgateComponent */
     public AggregateComponent(WizardDialog _CurUnoDialog, QueryMetaData _CurDBMetaData, int _iStep, int _iPosX, int _iPosY, int _iWidth, int _uitextfieldcount, int _firstHelpID)
     {
-        super(_CurUnoDialog, _CurDBMetaData.xMSF, _iStep, _iPosX + 10, _iPosY, _iWidth - 12, _uitextfieldcount, 18, _firstHelpID + 2);
+        super(_CurUnoDialog, _iStep, _iPosX + 10, _iPosY, _iWidth - 12, _uitextfieldcount, 18, _firstHelpID + 2);
         try
         {
             curHelpID = _firstHelpID;
diff --git a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
index 904ce6c1ba48..07995ad8d9c2 100644
--- a/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/CommandFieldSelection.java
@@ -205,7 +205,7 @@ public class CommandFieldSelection extends FieldSelection implements Comparator<
             {
                 curCommandName = sSelectedTableName; // sLocList[iSelPos];
                 CurDBMetaData.setTableByName(curCommandName);
-                binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE, AppendMode);
+                binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE);
             }
             else
             {
@@ -214,14 +214,14 @@ public class CommandFieldSelection extends FieldSelection implements Comparator<
                     CurDBMetaData.setCommandType(CommandType.TABLE);
                     curCommandName = JavaTools.replaceSubString(sSelectedTableName, PropertyNames.EMPTY_STRING, sTablePrefix);
                     CurDBMetaData.setTableByName(curCommandName);
-                    binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE, AppendMode);
+                    binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.TABLE);
                 }
                 else
                 {
                     CurDBMetaData.setCommandType(CommandType.QUERY);
                     curCommandName = JavaTools.replaceSubString(sSelectedTableName, PropertyNames.EMPTY_STRING, sQueryPrefix);
                     CurDBMetaData.setQueryByName(curCommandName);
-                    binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.QUERY, AppendMode);
+                    binitialize = CurDBMetaData.getFieldNamesOfCommand(curCommandName, CommandType.QUERY);
                 }
             }
             if (binitialize)
diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index 6f4db83dbd0b..afa33bf9e1c5 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java
@@ -19,7 +19,6 @@ package com.sun.star.wizards.ui;
 
 import com.sun.star.beans.*;
 import com.sun.star.awt.*;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.wizards.common.*;
 
 import java.util.*;
@@ -74,7 +73,7 @@ public abstract class ControlScroller
      * @param _firsthelpindex
      */
     // TODO add parameters for tabindices and helpindex
-    protected ControlScroller(WizardDialog _CurUnoDialog, XMultiServiceFactory _xMSF, int _iStep, int _iCompPosX, int _iCompPosY, int _iCompWidth, int _nblockincrement, int _nlinedistance, int _firsthelpindex)
+    protected ControlScroller(WizardDialog _CurUnoDialog, int _iStep, int _iCompPosX, int _iCompPosY, int _iCompWidth, int _nblockincrement, int _nlinedistance, int _firsthelpindex)
     {
         this.nblockincrement = _nblockincrement;
         this.CurUnoDialog = _CurUnoDialog;
diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
index f6eda577af28..6777e5c465d1 100644
--- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
@@ -39,7 +39,7 @@ public abstract class DBLimitedFieldSelection
     protected int FirstHelpIndex;
     protected int iCompPosX;
 
-    public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int _iCompPosX, int iCompPosY, int iCompWidth, int _FirstHelpIndex)
+    public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int _iCompPosX, int iCompPosY, int _FirstHelpIndex)
     {
         this.CurUnoDialog = _CurUnoDialog;
         FirstHelpIndex = _FirstHelpIndex;
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index bc4846f899be..7ffab7e89439 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -28,7 +28,6 @@ import com.sun.star.beans.XPropertyContainer;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.EventObject;
 import com.sun.star.lang.IllegalArgumentException;
-import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.sdb.SQLFilterOperator;
 import com.sun.star.sdbc.DataType;
 import com.sun.star.uno.Any;
@@ -46,6 +45,7 @@ import com.sun.star.wizards.common.PropertyNames;
 import com.sun.star.wizards.db.FieldColumn;
 import com.sun.star.wizards.db.QueryMetaData;
 import com.sun.star.wizards.db.SQLQueryComposer;
+
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -362,7 +362,7 @@ public class FilterComponent
 
     /** Creates a new instance of FilterComponent
      */
-    public FilterComponent(WizardDialog CurUnoDialog, XMultiServiceFactory _xMSF, int iStep, int iPosX, int iPosY, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID)
+    public FilterComponent(WizardDialog CurUnoDialog, int iStep, int iPosX, int iPosY, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID)
     {
         this.curHelpID = _firstHelpID;
         this.IStep = Integer.valueOf(iStep);
diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index d7bf664d301d..587c38d451fc 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -200,7 +200,7 @@ public class SortingComponent
      *
      * @param _index the first Sorting criterion in which 'ReadOnly is set to 'false'
      */
-    public void setReadOnlyUntil(int _index, boolean _bcomplete)
+    public void setReadOnlyUntil(int _index)
     {
         for (int i = 0; i <= 4; i++)
         {
diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
index eb999d09d708..a54377396b05 100644
--- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java
+++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java
@@ -39,7 +39,7 @@ public class TitlesComponent extends ControlScroller
 
     public TitlesComponent(WizardDialog _CurUnoDialog, int _iStep, int _iCompPosX, int _iCompPosY, int _iCompWidth, int _uitextfieldcount, String _slblColumnNames, String _slblColumnTitles, int _firsthelpindex)
     {
-        super(_CurUnoDialog, null, _iStep, _iCompPosX, _iCompPosY, _iCompWidth, _uitextfieldcount, 18, _firsthelpindex);
+        super(_CurUnoDialog, _iStep, _iCompPosX, _iCompPosY, _iCompWidth, _uitextfieldcount, 18, _firsthelpindex);
         CurUnoDialog.insertControlModel("com.sun.star.awt.UnoControlFixedTextModel", "lblColumnNames", new String[]
                 {
                     PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_WIDTH
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index a9839bcfd7c0..d9ccac6fd77d 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -772,7 +772,7 @@ public class UnoDialog
         }
     }
 
-    public void addResourceHandler(String _Unit, String _Module)
+    public void addResourceHandler(String _Module)
     {
         m_oResource = new Resource(xMSF, _Module);
     }