[Libreoffice-commits] core.git: 6 commits - wizards/com wizards/Jar_commonwizards.mk
Noel Grandin
noel at peralex.com
Thu Nov 27 04:21:03 PST 2014
wizards/Jar_commonwizards.mk | 23
wizards/com/sun/star/wizards/common/ConfigGroup.java | 166 -
wizards/com/sun/star/wizards/common/ConfigNode.java | 43
wizards/com/sun/star/wizards/common/ConfigSet.java | 428 ----
wizards/com/sun/star/wizards/common/Configuration.java | 220 --
wizards/com/sun/star/wizards/common/DebugHelper.java | 9
wizards/com/sun/star/wizards/common/Desktop.java | 162 -
wizards/com/sun/star/wizards/common/FileAccess.java | 433 ----
wizards/com/sun/star/wizards/common/Helper.java | 176 -
wizards/com/sun/star/wizards/common/Indexable.java | 24
wizards/com/sun/star/wizards/common/InvalidQueryException.java | 4
wizards/com/sun/star/wizards/common/JavaTools.java | 127 -
wizards/com/sun/star/wizards/common/NamedValueCollection.java | 20
wizards/com/sun/star/wizards/common/NoValidPathException.java | 4
wizards/com/sun/star/wizards/common/NumberFormatter.java | 42
wizards/com/sun/star/wizards/common/NumericalHelper.java | 993 ----------
wizards/com/sun/star/wizards/common/PlaceholderTextElement.java | 9
wizards/com/sun/star/wizards/common/PropertySetHelper.java | 118 -
wizards/com/sun/star/wizards/common/Resource.java | 13
wizards/com/sun/star/wizards/common/SystemDialog.java | 269 --
wizards/com/sun/star/wizards/common/TemplateElement.java | 2
wizards/com/sun/star/wizards/common/UCB.java | 239 --
wizards/com/sun/star/wizards/common/XMLHelper.java | 54
wizards/com/sun/star/wizards/common/XMLProvider.java | 26
wizards/com/sun/star/wizards/db/BlindtextCreator.java | 10
wizards/com/sun/star/wizards/db/ColumnPropertySet.java | 32
wizards/com/sun/star/wizards/db/CommandMetaData.java | 136 -
wizards/com/sun/star/wizards/db/CommandName.java | 3
wizards/com/sun/star/wizards/db/DBMetaData.java | 56
wizards/com/sun/star/wizards/db/FieldColumn.java | 14
wizards/com/sun/star/wizards/db/QueryMetaData.java | 33
wizards/com/sun/star/wizards/db/RecordParser.java | 11
wizards/com/sun/star/wizards/db/RelationController.java | 5
wizards/com/sun/star/wizards/db/SQLQueryComposer.java | 16
wizards/com/sun/star/wizards/db/TableDescriptor.java | 34
wizards/com/sun/star/wizards/db/TypeInspector.java | 49
wizards/com/sun/star/wizards/document/Control.java | 17
wizards/com/sun/star/wizards/document/DatabaseControl.java | 24
wizards/com/sun/star/wizards/document/FormHandler.java | 129 -
wizards/com/sun/star/wizards/document/GridControl.java | 1
wizards/com/sun/star/wizards/document/OfficeDocument.java | 172 -
wizards/com/sun/star/wizards/document/TimeStampControl.java | 1
wizards/com/sun/star/wizards/form/FieldLinker.java | 4
wizards/com/sun/star/wizards/form/FormConfiguration.java | 3
wizards/com/sun/star/wizards/form/FormControlArranger.java | 15
wizards/com/sun/star/wizards/form/FormDocument.java | 23
wizards/com/sun/star/wizards/form/FormWizard.java | 10
wizards/com/sun/star/wizards/form/StyleApplier.java | 7
wizards/com/sun/star/wizards/query/CallQueryWizard.java | 3
wizards/com/sun/star/wizards/query/QuerySummary.java | 1
wizards/com/sun/star/wizards/query/QueryWizard.java | 13
wizards/com/sun/star/wizards/report/DBColumn.java | 20
wizards/com/sun/star/wizards/report/Dataimport.java | 9
wizards/com/sun/star/wizards/report/RecordTable.java | 4
wizards/com/sun/star/wizards/report/ReportLayouter.java | 1
wizards/com/sun/star/wizards/report/ReportTextDocument.java | 72
wizards/com/sun/star/wizards/report/ReportTextImplementation.java | 8
wizards/com/sun/star/wizards/report/ReportWizard.java | 4
wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java | 4
wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 5
wizards/com/sun/star/wizards/table/CallTableWizard.java | 5
wizards/com/sun/star/wizards/table/FieldFormatter.java | 7
wizards/com/sun/star/wizards/table/Finalizer.java | 3
wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 2
wizards/com/sun/star/wizards/table/ScenarioSelector.java | 9
wizards/com/sun/star/wizards/table/TableWizard.java | 14
wizards/com/sun/star/wizards/text/TextDocument.java | 212 --
wizards/com/sun/star/wizards/text/TextFieldHandler.java | 32
wizards/com/sun/star/wizards/text/TextFrameHandler.java | 40
wizards/com/sun/star/wizards/text/TextSectionHandler.java | 19
wizards/com/sun/star/wizards/text/TextTableHandler.java | 34
wizards/com/sun/star/wizards/ui/AggregateComponent.java | 10
wizards/com/sun/star/wizards/ui/ButtonList.java | 36
wizards/com/sun/star/wizards/ui/CommandFieldSelection.java | 6
wizards/com/sun/star/wizards/ui/ControlScroller.java | 43
wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java | 20
wizards/com/sun/star/wizards/ui/DocumentPreview.java | 160 -
wizards/com/sun/star/wizards/ui/FieldSelection.java | 20
wizards/com/sun/star/wizards/ui/FilterComponent.java | 27
wizards/com/sun/star/wizards/ui/ImageList.java | 983 ---------
wizards/com/sun/star/wizards/ui/PathSelection.java | 192 -
wizards/com/sun/star/wizards/ui/PeerConfig.java | 45
wizards/com/sun/star/wizards/ui/SortingComponent.java | 25
wizards/com/sun/star/wizards/ui/TitlesComponent.java | 2
wizards/com/sun/star/wizards/ui/UIConsts.java | 2
wizards/com/sun/star/wizards/ui/UnoDialog.java | 163 -
wizards/com/sun/star/wizards/ui/UnoDialog2.java | 36
wizards/com/sun/star/wizards/ui/WizardDialog.java | 32
wizards/com/sun/star/wizards/ui/XCommandSelectionListener.java | 24
wizards/com/sun/star/wizards/ui/XCompletion.java | 4
wizards/com/sun/star/wizards/ui/XFieldSelectionListener.java | 2
wizards/com/sun/star/wizards/ui/XPathSelectionListener.java | 25
wizards/com/sun/star/wizards/ui/event/DataAware.java | 180 -
wizards/com/sun/star/wizards/ui/event/DataAwareFields.java | 4
wizards/com/sun/star/wizards/ui/event/EventNames.java | 38
wizards/com/sun/star/wizards/ui/event/ListModelBinder.java | 172 -
wizards/com/sun/star/wizards/ui/event/MethodInvocation.java | 74
wizards/com/sun/star/wizards/ui/event/RadioDataAware.java | 86
wizards/com/sun/star/wizards/ui/event/SimpleDataAware.java | 75
wizards/com/sun/star/wizards/ui/event/Task.java | 174 -
wizards/com/sun/star/wizards/ui/event/TaskEvent.java | 42
wizards/com/sun/star/wizards/ui/event/TaskListener.java | 35
wizards/com/sun/star/wizards/ui/event/UnoDataAware.java | 236 --
wizards/com/sun/star/wizards/ui/event/XMouseListenerAdapter.java | 39
104 files changed, 196 insertions(+), 7746 deletions(-)
New commits:
commit 9a7653d09997d43a83efa5852bd7fce24da6e109
Author: Noel Grandin <noel at peralex.com>
Date: Thu Nov 27 14:13:12 2014 +0200
java,wizards: remove unused parameters
Change-Id: I13f0c7afca233cc0ff6692f8fb442a80c4208d20
diff --git a/wizards/com/sun/star/wizards/common/InvalidQueryException.java b/wizards/com/sun/star/wizards/common/InvalidQueryException.java
index efe21aa..56a54eb 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 074b8f5..2881a79 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 e5fefd4..ac91684 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 96208c8..6f532f1 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 4797c5a..3fdbf12 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 9e7797c..607760f 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 c5fcfc2..aae6049 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 31b7efd..fb48d02 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 10cc634..d28db51 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 db30c16..d930b67 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 64ed301..a7bfb13 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 340b7d4..39aaa57 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 cfc697c..b358f3a 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 8c3fc79..41c975f 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 9fe8752..8ef1936 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 17e45ba..5c57fe4 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 55386e7..3e6b087 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 762876f..00c39ba 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 a3fd4c1..0785ff3 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 1ce0bfd..92a63d6 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 c4c3813..3484975 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 2dea1ab..3527d7d 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 3c21bff..5a68433 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 d47b868..42d1186 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 d8fb8ee..050e504 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 3dd4a33..8ece17c 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 5ee1b07..94f7da8 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 0b27434..4588683 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 904ce6c..07995ad 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 6f4db83..afa33bf 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 f6eda57..6777e5c 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 bc4846f..7ffab7e 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 d7bf664..587c38d 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 eb999d0..a543773 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 a9839bc..d9ccac6 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);
}
commit 2eb6f15102c8ea2374ae8fa19e5ac9693a4ee05e
Author: Noel Grandin <noel at peralex.com>
Date: Thu Nov 27 14:08:09 2014 +0200
java,wizards: remove unread fields
found by UCDetector
Change-Id: Ia98606a98b998a224f821f2e673e788fb0ecf7d1
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java
index ee82635..63a5318 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.java
+++ b/wizards/com/sun/star/wizards/common/FileAccess.java
@@ -482,7 +482,6 @@ public class FileAccess
return LocLayoutFiles;
}
public XSimpleFileAccess2 fileAccess;
- public XFileIdentifierConverter filenameConverter;
public FileAccess(XMultiServiceFactory xmsf) throws com.sun.star.uno.Exception
{
@@ -491,7 +490,7 @@ public class FileAccess
fileAccess = UnoRuntime.queryInterface(XSimpleFileAccess2.class, fa);
//get the file identifier converter
Object fcv = xmsf.createInstance("com.sun.star.ucb.FileContentProvider");
- filenameConverter = UnoRuntime.queryInterface(XFileIdentifierConverter.class, fcv);
+ UnoRuntime.queryInterface(XFileIdentifierConverter.class, fcv);
}
/**
diff --git a/wizards/com/sun/star/wizards/common/Helper.java b/wizards/com/sun/star/wizards/common/Helper.java
index 61b7c3b..58f83cd 100644
--- a/wizards/com/sun/star/wizards/common/Helper.java
+++ b/wizards/com/sun/star/wizards/common/Helper.java
@@ -220,7 +220,6 @@ public class Helper
return null;
}
}
- private static long DAY_IN_MILLIS = (24 * 60 * 60 * 1000);
public static XComponentContext getComponentContext(XMultiServiceFactory _xMSF)
{
diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java
index 0dd3986..7505b7b 100644
--- a/wizards/com/sun/star/wizards/common/NumericalHelper.java
+++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java
@@ -43,9 +43,6 @@ public class NumericalHelper
public static final int STRING_TYPE = -1;
public static final int BOOLEAN_TYPE = -2;
public static final int SEQUENCE_TYPE = -3;
- private static final int HEX_BASE = 16;
- private static final int DEC_BASE = 10;
- private static final int ASCII_LETTER_A_OFFSET = 55;
/**
* private c'tor to prevent instantiation
diff --git a/wizards/com/sun/star/wizards/common/SystemDialog.java b/wizards/com/sun/star/wizards/common/SystemDialog.java
index 300bcdc..e5fefd4 100644
--- a/wizards/com/sun/star/wizards/common/SystemDialog.java
+++ b/wizards/com/sun/star/wizards/common/SystemDialog.java
@@ -21,9 +21,7 @@ import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.ui.dialogs.*;
import com.sun.star.uno.XInterface;
import com.sun.star.uno.UnoRuntime;
-import com.sun.star.util.XStringSubstitution;
import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XInitialization;
import com.sun.star.frame.XFrame;
import com.sun.star.awt.XWindowPeer;
import com.sun.star.awt.XToolkit;
@@ -32,17 +30,7 @@ import com.sun.star.awt.XMessageBox;
public class SystemDialog
{
- Object systemDialog;
- XFilePicker xFilePicker;
- XFolderPicker2 xFolderPicker;
XFilterManager xFilterManager;
- XInitialization xInitialize;
- XExecutableDialog xExecutable;
- XComponent xComponent;
- XFilePickerControlAccess xFilePickerControlAccess;
- XMultiServiceFactory xMSF;
- public XStringSubstitution xStringSubstitution;
- public String sStorePath;
public static int showErrorBox(XMultiServiceFactory xMSF, String ResName, String ResPrefix, int ResID, String AddTag, String AddString)
{
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java
index 6153465..9e7797c 100644
--- a/wizards/com/sun/star/wizards/db/CommandMetaData.java
+++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java
@@ -23,7 +23,6 @@ import com.sun.star.uno.AnyConverter;
import com.sun.star.awt.VclWindowPeerAttribute;
import com.sun.star.uno.UnoRuntime;
import com.sun.star.beans.XPropertySet;
-import com.sun.star.container.XIndexAccess;
import com.sun.star.container.XNameAccess;
import com.sun.star.wizards.common.Helper;
import com.sun.star.wizards.common.JavaTools;
@@ -65,7 +64,6 @@ public class CommandMetaData extends DBMetaData
String sCatalogSep = PropertyNames.EMPTY_STRING;
String sIdentifierQuote = PropertyNames.EMPTY_STRING;
boolean bCommandComposerAttributesalreadyRetrieved = false;
- private XIndexAccess xIndexKeys;
public CommandMetaData(XMultiServiceFactory xMSF)
{
diff --git a/wizards/com/sun/star/wizards/db/CommandName.java b/wizards/com/sun/star/wizards/db/CommandName.java
index 1db9979..804c647 100644
--- a/wizards/com/sun/star/wizards/db/CommandName.java
+++ b/wizards/com/sun/star/wizards/db/CommandName.java
@@ -34,7 +34,6 @@ public class CommandName
protected String AliasName = PropertyNames.EMPTY_STRING;
protected boolean bCatalogAtStart;
protected String sCatalogSep;
- protected String sIdentifierQuote;
protected boolean baddQuotation = true;
public CommandName(CommandMetaData _CommandMetaData, String _DisplayName)
@@ -176,7 +175,7 @@ public class CommandName
{
bCatalogAtStart = oCommandMetaData.xDBMetaData.isCatalogAtStart();
sCatalogSep = oCommandMetaData.xDBMetaData.getCatalogSeparator();
- sIdentifierQuote = oCommandMetaData.xDBMetaData.getIdentifierQuoteString();
+ oCommandMetaData.xDBMetaData.getIdentifierQuoteString();
return true;
}
catch (SQLException e)
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 7782c84..eaa2d78 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -85,10 +85,8 @@ public class DBMetaData
private XPropertySet m_dataSourceSettings;
private XOfficeDatabaseDocument xModel;
private XPropertySet xDataSourcePropertySet;
- public String[] DataSourceNames;
public java.util.ArrayList<CommandObject> CommandObjects = new ArrayList<CommandObject>(1);
public Locale aLocale;
- public int[] CommandTypes;
public String DataSourceName;
public com.sun.star.sdbc.XConnection DBConnection;
private com.sun.star.sdb.tools.XConnectionTools m_connectionTools;
@@ -192,7 +190,7 @@ public class DBMetaData
this.xMSF = xMSF;
xDatabaseContext = (XInterface) xMSF.createInstance("com.sun.star.sdb.DatabaseContext");
xNameAccess = UnoRuntime.queryInterface( XNameAccess.class, xDatabaseContext );
- DataSourceNames = xNameAccess.getElementNames();
+ xNameAccess.getElementNames();
}
catch (Exception e)
{
diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java
index 5e6f19d..649434d 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -43,7 +43,6 @@ public class RecordParser extends QueryMetaData
public XResultSet ResultSet;
XInterface xRowSet;
XCompletedExecution xExecute;
- XColumnsSupplier xRowSetColumnsSupplier;
XComponent xRowSetComponent;
XInteractionHandler xInteraction;
public FieldColumn[] GroupFieldColumns;
@@ -61,7 +60,7 @@ public class RecordParser extends QueryMetaData
try
{
xRowSet = (XInterface) xMSF.createInstance("com.sun.star.sdb.RowSet");
- xRowSetColumnsSupplier = UnoRuntime.queryInterface(XColumnsSupplier.class, xRowSet);
+ UnoRuntime.queryInterface(XColumnsSupplier.class, xRowSet);
xRowSetComponent = UnoRuntime.queryInterface(XComponent.class, xRowSet);
xExecute = UnoRuntime.queryInterface(XCompletedExecution.class, xRowSet);
XInterface oInteraction = (XInterface) xMSF.createInstance("com.sun.star.task.InteractionHandler");
diff --git a/wizards/com/sun/star/wizards/db/TypeInspector.java b/wizards/com/sun/star/wizards/db/TypeInspector.java
index c76e326..db30c16 100644
--- a/wizards/com/sun/star/wizards/db/TypeInspector.java
+++ b/wizards/com/sun/star/wizards/db/TypeInspector.java
@@ -37,7 +37,6 @@ public class TypeInspector
private int[] nDataTypeInfos;
private int[] nPrecisionInfos;
private int[] nNullableInfos;
- private int[] nSearchables;
private boolean[] bisAutoIncrementableInfos;
private int[] nMinScaleInfos;
private int[] nMaxScaleInfos;
@@ -50,15 +49,10 @@ public class TypeInspector
public class TypeInfo
{
-
- public int nDataType;
- public String sDataTypeName;
public boolean bisAutoIncrementable;
public TypeInfo(int _nDataType, String _sDataTypeName, boolean _bisAutoIncrementable)
{
- nDataType = _nDataType;
- sDataTypeName = _sDataTypeName;
bisAutoIncrementable = _bisAutoIncrementable;
}
}
@@ -93,7 +87,7 @@ public class TypeInspector
aTypeNameVector.toArray(sDataTypeNames);
nDataTypeInfos = JavaTools.IntegerTointList(aTypeVector);
nNullableInfos = JavaTools.IntegerTointList(aNullableVector);
- nSearchables = JavaTools.IntegerTointList(aSearchableVector);
+ JavaTools.IntegerTointList(aSearchableVector);
bisAutoIncrementableInfos = JavaTools.BooleanTobooleanList(aAutoIncrementVector);
nPrecisionInfos = JavaTools.IntegerTointList(aPrecisionVector);
nMinScaleInfos = JavaTools.IntegerTointList(aMinScaleVector);
diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java
index de4aa3d..64ed301 100644
--- a/wizards/com/sun/star/wizards/document/Control.java
+++ b/wizards/com/sun/star/wizards/document/Control.java
@@ -42,7 +42,6 @@ public class Control extends Shape
XControlModel xControlModel;
XControl xControl;
public XPropertySet xPropertySet;
- XPropertySet xControlPropertySet;
XWindowPeer xWindowPeer;
String sServiceName;
static final int SOMAXTEXTSIZE = 50;
@@ -97,7 +96,7 @@ public class Control extends Shape
_xGroupShapes.add(xShape);
}
xControl = oFormHandler.xControlAccess.getControl(xControlModel);
- xControlPropertySet = UnoRuntime.queryInterface( XPropertySet.class, xControl );
+ UnoRuntime.queryInterface( XPropertySet.class, xControl );
xWindowPeer = xControl.getPeer();
}
catch (Exception e)
diff --git a/wizards/com/sun/star/wizards/document/DatabaseControl.java b/wizards/com/sun/star/wizards/document/DatabaseControl.java
index 1b1e07e..1416811 100644
--- a/wizards/com/sun/star/wizards/document/DatabaseControl.java
+++ b/wizards/com/sun/star/wizards/document/DatabaseControl.java
@@ -159,8 +159,6 @@ public class DatabaseControl extends Control
}
}
- private static long m_nLongMax = 0;
-
public void setNumericLimits()
{
try
diff --git a/wizards/com/sun/star/wizards/document/FormHandler.java b/wizards/com/sun/star/wizards/document/FormHandler.java
index 7b6c016..340b7d4 100644
--- a/wizards/com/sun/star/wizards/document/FormHandler.java
+++ b/wizards/com/sun/star/wizards/document/FormHandler.java
@@ -93,12 +93,9 @@ public class FormHandler
public class ControlData
{
-
int DataType;
int ControlType;
- String ControlService;
String GridColumnName;
- boolean bIsText;
}
/** Creates a new instance of FormHandler */
@@ -178,9 +175,7 @@ public class FormHandler
ControlData curControlData = new ControlData();
curControlData.DataType = _datatype;
curControlData.ControlType = _controltype;
- curControlData.ControlService = _scontrolservicename;
curControlData.GridColumnName = _gridcolumnname;
- curControlData.bIsText = _bIsTextControl;
return curControlData;
}
diff --git a/wizards/com/sun/star/wizards/form/FormConfiguration.java b/wizards/com/sun/star/wizards/form/FormConfiguration.java
index 2a5288e..ef46eeb1 100644
--- a/wizards/com/sun/star/wizards/form/FormConfiguration.java
+++ b/wizards/com/sun/star/wizards/form/FormConfiguration.java
@@ -45,7 +45,6 @@ public class FormConfiguration
XRadioButton optOnExistingRelation;
XCheckBox chkcreateSubForm;
XRadioButton optSelectManually;
- XFixedText lblSubFormDescription;
XFixedText lblRelations;
XListBox lstRelations;
String[] sreferencedTables;
@@ -135,7 +134,7 @@ public class FormConfiguration
{
Boolean.FALSE, 37, "HID:WIZARDS_HID_DLGFORM_lstRELATIONS", 201, 55, ISubFormStep, Short.valueOf(curtabindex++), 103
});
- lblSubFormDescription = CurUnoDialog.insertLabel("lblSubFormDescription",
+ CurUnoDialog.insertLabel("lblSubFormDescription",
new String[]
{
PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
index a40e70d..0114d87 100644
--- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java
@@ -56,7 +56,6 @@ public class CallQueryWizard
public static class QueryWizardImplementation extends com.sun.star.lib.uno.helper.PropertySet implements com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, com.sun.star.task.XJobExecutor
{
private PropertyValue[] m_wizardContext;
- public String Command;
/** The constructor of the inner class has a XMultiServiceFactory parameter.
* @param i_serviceFactory A special service factory could be introduced while initializing.
@@ -76,7 +75,7 @@ public class CallQueryWizard
if (sEvent.equals(PropertyNames.START))
{
QueryWizard CurQueryWizard = new QueryWizard( m_serviceFactory, m_wizardContext );
- Command = CurQueryWizard.start();
+ CurQueryWizard.start();
}
}
catch (Exception exception)
diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java
index ba3dc22..1ce0bfd 100644
--- a/wizards/com/sun/star/wizards/report/Dataimport.java
+++ b/wizards/com/sun/star/wizards/report/Dataimport.java
@@ -36,7 +36,6 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
static String sProgressDBConnection;
static String sProgressDataImport;
- static String sProgressBaseCurRecord;
static String sProgressTitle;
static String sStop;
@@ -47,7 +46,7 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi
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);
- sProgressBaseCurRecord = m_oResource.getResText(UIConsts.RID_REPORT + 63);
+ m_oResource.getResText(UIConsts.RID_REPORT + 63);
sStop = m_oResource.getResText(UIConsts.RID_DB_COMMON + 21);
}
diff --git a/wizards/com/sun/star/wizards/report/RecordTable.java b/wizards/com/sun/star/wizards/report/RecordTable.java
index 132cb76..14a8f46 100644
--- a/wizards/com/sun/star/wizards/report/RecordTable.java
+++ b/wizards/com/sun/star/wizards/report/RecordTable.java
@@ -23,7 +23,6 @@ import com.sun.star.container.XNamed;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.table.XCellRange;
import com.sun.star.table.XTableColumns;
-import com.sun.star.table.XTableRows;
import com.sun.star.text.XTextTable;
import com.sun.star.uno.Exception;
import com.sun.star.uno.UnoRuntime;
@@ -38,7 +37,6 @@ public class RecordTable
public XTextTable xTextTable;
private TextTableHandler oTextTableHandler;
public XTableColumns xTableColumns;
- public XTableRows xTableRows;
public RecordTable(TextTableHandler _oTextTableHandler)
{
@@ -69,7 +67,7 @@ public class RecordTable
xTableName = UnoRuntime.queryInterface(XNamed.class, xTextTable);
xTableName.setName(ReportTextDocument.TBLRECORDSECTION);
}
- xTableRows = xTextTable.getRows();
+ xTextTable.getRows();
xTableColumns = xTextTable.getColumns();
xCellRange = UnoRuntime.queryInterface(XCellRange.class, xTextTable);
}
diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
index 5daa5e5..c4c3813 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java
@@ -216,7 +216,6 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen
Helper.setUnoPropertyValue(FirstPageStyle, SIZE, oNewSize);
int iLeftMargin = AnyConverter.toInt(Helper.getUnoPropertyValue(ReportPageStyle, "LeftMargin"));
int iRightMargin = AnyConverter.toInt(Helper.getUnoPropertyValue(ReportPageStyle, "RightMargin"));
- PageWidth = oNewSize.Width - iLeftMargin - iRightMargin;
if (CurRecordTable != null)
{
CurRecordTable.adjustOptimalTableWidths(xMSF, oViewHandler);
diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
index fff21ad..2dea1ab 100644
--- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
+++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java
@@ -127,17 +127,15 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme
}
static String sMsgQueryCreationImpossible;
static String sReportFormNotExisting;
- static String sMsgHiddenControlMissing;
static String sMsgEndAutopilot;
- static String sMsgNoConnection;
private void initialResources()
{
sReportFormNotExisting = m_resource.getResText(UIConsts.RID_REPORT + 64);
sMsgQueryCreationImpossible = m_resource.getResText(UIConsts.RID_REPORT + 65);
- sMsgHiddenControlMissing = m_resource.getResText(UIConsts.RID_REPORT + 66);
+ m_resource.getResText(UIConsts.RID_REPORT + 66);
sMsgEndAutopilot = m_resource.getResText(UIConsts.RID_DB_COMMON + 33);
- sMsgNoConnection = m_resource.getResText(UIConsts.RID_DB_COMMON + 14);
+ m_resource.getResText(UIConsts.RID_DB_COMMON + 14);
}
public void addTextSectionCopies()
diff --git a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
index 32a0f07..974464a 100644
--- a/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
+++ b/wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java
@@ -33,8 +33,6 @@ public class DesignTemplate
{
private XReportDefinition m_xReportDefinition;
- XMultiServiceFactory m_xGlobalMSF;
- String m_sFilename;
private DesignTemplate()
{
@@ -290,8 +288,6 @@ public class DesignTemplate
private void load(XMultiServiceFactory _xMSF, String _sPath) throws com.sun.star.uno.Exception
{
- m_xGlobalMSF = _xMSF;
- m_sFilename = _sPath;
final Object aObj = _xMSF.createInstance("com.sun.star.report.ReportDefinition");
m_xReportDefinition = UnoRuntime.queryInterface(XReportDefinition.class, aObj);
diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java
index 605a796..07b8300 100644
--- a/wizards/com/sun/star/wizards/table/CallTableWizard.java
+++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java
@@ -56,9 +56,6 @@ public class CallTableWizard
{
private PropertyValue[] m_wizardContext;
- // <properties>
- public String Command;
- // </properties>
/** The constructor of the inner class has a XMultiServiceFactory parameter.
*/
@@ -77,7 +74,7 @@ public class CallTableWizard
if ( sEvent.equals(PropertyNames.START) )
{
TableWizard CurTableWizard = new TableWizard( m_serviceFactory, m_wizardContext );
- Command = CurTableWizard.startTableWizard();
+ CurTableWizard.startTableWizard();
}
}
catch (Exception exception)
diff --git a/wizards/com/sun/star/wizards/table/Finalizer.java b/wizards/com/sun/star/wizards/table/Finalizer.java
index f4cb9d4..1e5832f 100644
--- a/wizards/com/sun/star/wizards/table/Finalizer.java
+++ b/wizards/com/sun/star/wizards/table/Finalizer.java
@@ -36,7 +36,6 @@ public class Finalizer
short curtabindex;
XRadioButton optModifyTable;
XRadioButton optWorkWithTable;
- XRadioButton optStartFormWizard;
XTextComponent txtTableName;
XListBox xCatalogListBox;
XListBox xSchemaListBox;
@@ -245,7 +244,7 @@ public class Finalizer
{
UIConsts.INTEGERS[8], "HID:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE", sModifyTable, 101, Integer.valueOf(109 + ndiffPosY), IFINALSTEP, Short.valueOf(curtabindex++), 177
});
- optStartFormWizard = CurUnoDialog.insertRadioButton("optStartFormWizard", null,
+ CurUnoDialog.insertRadioButton("optStartFormWizard", null,
new String[]
{
PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java
index 24e1e71..3dd4a33 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -44,7 +44,6 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
ScenarioSelector curScenarioSelector;
FieldFormatter curFieldFormatter;
PrimaryKeyHandler curPrimaryKeyHandler;
- String sMsgWizardName = PropertyNames.EMPTY_STRING;
public HashMap<String, FieldDescription> fielditems;
int wizardmode;
String tablename;
@@ -381,7 +380,7 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
public boolean getTableResources()
{
- sMsgWizardName = super.m_oResource.getResText(UIConsts.RID_TABLE + 1);
+ super.m_oResource.getResText(UIConsts.RID_TABLE + 1);
slblFields = m_oResource.getResText(UIConsts.RID_TABLE + 19);
slblSelFields = m_oResource.getResText(UIConsts.RID_TABLE + 25);
serrToManyFields = m_oResource.getResText(UIConsts.RID_TABLE + 47);
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java
index e497926..ecb4907 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.java
+++ b/wizards/com/sun/star/wizards/text/TextDocument.java
@@ -28,7 +28,6 @@ import com.sun.star.awt.Size;
import com.sun.star.awt.XWindowPeer;
import com.sun.star.beans.PropertyValue;
import com.sun.star.beans.PropertyVetoException;
-import com.sun.star.lang.Locale;
import com.sun.star.lang.XComponent;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.style.XStyle;
@@ -51,18 +50,12 @@ public class TextDocument
public XComponent xComponent;
public com.sun.star.text.XTextDocument xTextDocument;
- public com.sun.star.document.XDocumentProperties m_xDocProps;
public com.sun.star.task.XStatusIndicator xProgressBar;
public com.sun.star.frame.XFrame xFrame;
public XText xText;
public XMultiServiceFactory xMSFDoc;
public XMultiServiceFactory xMSF;
- public com.sun.star.util.XNumberFormatsSupplier xNumberFormatsSupplier;
public com.sun.star.awt.XWindowPeer xWindowPeer;
- public int PageWidth;
- public Size DocSize;
- public com.sun.star.lang.Locale CharLocale;
- public XStorable xStorable;
// creates an instance of TextDocument by loading a given URL as preview
public TextDocument(XMultiServiceFactory xMSF, String _sPreviewURL, boolean bShowStatusIndicator, XTerminateListener listener)
@@ -157,11 +150,11 @@ public class TextDocument
}
xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xFrame.getComponentWindow());
xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument);
- xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);
+ UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);
XDocumentPropertiesSupplier xDocPropsSuppl = UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument);
- m_xDocProps = xDocPropsSuppl.getDocumentProperties();
- CharLocale = (Locale) Helper.getUnoStructValue(xComponent, "CharLocale");
+ xDocPropsSuppl.getDocumentProperties();
+ Helper.getUnoStructValue(xComponent, "CharLocale");
xText = xTextDocument.getText();
}
@@ -169,11 +162,11 @@ public class TextDocument
{
xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xFrame.getComponentWindow());
xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument);
- xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);
+ UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);
XDocumentPropertiesSupplier xDocPropsSuppl = UnoRuntime.queryInterface(XDocumentPropertiesSupplier.class, xTextDocument);
- m_xDocProps = xDocPropsSuppl.getDocumentProperties();
- CharLocale = (Locale) Helper.getUnoStructValue(xComponent, "CharLocale");
- xStorable = UnoRuntime.queryInterface(XStorable.class, xTextDocument);
+ xDocPropsSuppl.getDocumentProperties();
+ Helper.getUnoStructValue(xComponent, "CharLocale");
+ UnoRuntime.queryInterface(XStorable.class, xTextDocument);
xText = xTextDocument.getText();
}
@@ -214,7 +207,7 @@ public class TextDocument
}
Object oDoc = OfficeDocument.load(xFrame, sDefaultTemplate, "_self", loadValues);
xTextDocument = (com.sun.star.text.XTextDocument) oDoc;
- DocSize = getPageSize();
+ getPageSize();
xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument);
ViewHandler myViewHandler = new ViewHandler(xTextDocument);
diff --git a/wizards/com/sun/star/wizards/text/TextTableHandler.java b/wizards/com/sun/star/wizards/text/TextTableHandler.java
index 91a1267..5ee1b07 100644
--- a/wizards/com/sun/star/wizards/text/TextTableHandler.java
+++ b/wizards/com/sun/star/wizards/text/TextTableHandler.java
@@ -42,9 +42,7 @@ public class TextTableHandler
{
public XTextTablesSupplier xTextTablesSupplier;
- public XMultiServiceFactory xMSFDoc;
public XTextDocument xTextDocument;
- public XSimpleText xSimpleText;
private NumberFormatter oNumberFormatter;
/** Creates a new instance of TextTableHandler */
@@ -52,10 +50,9 @@ public class TextTableHandler
{
try
{
- this.xMSFDoc = xMSF;
this.xTextDocument = xTextDocument;
xTextTablesSupplier = UnoRuntime.queryInterface(XTextTablesSupplier.class, xTextDocument);
- xSimpleText = UnoRuntime.queryInterface(XSimpleText.class, xTextDocument.getText());
+ UnoRuntime.queryInterface(XSimpleText.class, xTextDocument.getText());
XNumberFormatsSupplier xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);
Locale aCharLocale = (Locale) Helper.getUnoStructValue(xTextDocument, "CharLocale");
oNumberFormatter = new NumberFormatter(xNumberFormatsSupplier, aCharLocale);
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index bd8a446..0b27434 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import com.sun.star.awt.FontDescriptor;
import com.sun.star.awt.VclWindowPeerAttribute;
-import com.sun.star.awt.XButton;
import com.sun.star.awt.XListBox;
import com.sun.star.beans.PropertyValue;
import com.sun.star.lang.EventObject;
@@ -44,8 +43,6 @@ public class AggregateComponent extends ControlScroller
"SUM", "AVG", "MIN", "MAX"
};
QueryMetaData CurDBMetaData;
- XButton optDetailQuery;
- XButton optSummaryQuery;
String soptDetailQuery;
String soptSummaryQuery;
String slblAggregate;
@@ -67,7 +64,7 @@ public class AggregateComponent extends ControlScroller
curHelpID = _firstHelpID;
this.CurDBMetaData = _CurDBMetaData;
Count = 1;
- optDetailQuery = CurUnoDialog.insertRadioButton("optDetailQuery", 0, new ActionListenerImpl(),
+ CurUnoDialog.insertRadioButton("optDetailQuery", 0, new ActionListenerImpl(),
new String[]
{
PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STATE, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
@@ -77,7 +74,7 @@ public class AggregateComponent extends ControlScroller
8, HelpIds.getHelpIdString(curHelpID), soptDetailQuery, Integer.valueOf(_iPosX), Integer.valueOf(iCompPosY - 42), Short.valueOf((short) 1), IStep, Short.valueOf(curtabindex++), Integer.valueOf(iCompWidth)
});
- optSummaryQuery = CurUnoDialog.insertRadioButton("optSummaryQuery", 0, new ActionListenerImpl(),
+ CurUnoDialog.insertRadioButton("optSummaryQuery", 0, new ActionListenerImpl(),
new String[]
{
PropertyNames.PROPERTY_HEIGHT, PropertyNames.PROPERTY_HELPURL, PropertyNames.PROPERTY_LABEL, PropertyNames.PROPERTY_MULTILINE, PropertyNames.PROPERTY_POSITION_X, PropertyNames.PROPERTY_POSITION_Y, PropertyNames.PROPERTY_STEP, PropertyNames.PROPERTY_TABINDEX, PropertyNames.PROPERTY_WIDTH
diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index fc4873a..6f4db83 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java
@@ -28,7 +28,6 @@ public abstract class ControlScroller
{
protected WizardDialog CurUnoDialog;
- protected XMultiServiceFactory xMSF;
protected int ncurfieldcount;
protected int nblockincrement;
private int nlineincrement;
@@ -36,11 +35,8 @@ public abstract class ControlScroller
protected int ntotfieldcount;
XScrollBar xScrollBar;
protected ArrayList<PropertyValue[]> scrollfields;
- protected Integer ICompPosX;
protected int iCompPosX;
- protected Integer ICompPosY;
protected int iCompPosY;
- protected Integer ICompWidth;
protected int iCompWidth;
protected int iCompHeight;
protected int iStartPosY;
@@ -80,7 +76,6 @@ public abstract class ControlScroller
// 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)
{
- this.xMSF = _xMSF;
this.nblockincrement = _nblockincrement;
this.CurUnoDialog = _CurUnoDialog;
this.iStep = _iStep;
@@ -90,10 +85,7 @@ public abstract class ControlScroller
IStep = Integer.valueOf(iStep);
this.iCompPosX = _iCompPosX;
this.iCompPosY = _iCompPosY;
- this.ICompPosX = Integer.valueOf(iCompPosX);
- this.ICompPosY = Integer.valueOf(iCompPosY);
this.iCompWidth = _iCompWidth;
- this.ICompWidth = Integer.valueOf(iCompWidth);
this.iCompHeight = 2 * SORELFIRSTPOSY + nblockincrement * linedistance;
iStartPosY = iCompPosY + SORELFIRSTPOSY;
int ScrollHeight = iCompHeight - 2;
diff --git a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
index 291f1b4..f6eda57 100644
--- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java
@@ -18,7 +18,6 @@
package com.sun.star.wizards.ui;
import com.sun.star.awt.XListBox;
-import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.wizards.common.Helper;
import com.sun.star.wizards.common.JavaTools;
import com.sun.star.wizards.common.PropertyNames;
@@ -30,13 +29,9 @@ import com.sun.star.wizards.common.PropertyNames;
public abstract class DBLimitedFieldSelection
{
- protected XMultiServiceFactory xMSF;
protected WizardDialog CurUnoDialog;
protected String sNoField;
protected Integer IStep;
- protected Integer ICompPosX;
- protected Integer ICompPosY;
- protected Integer ICompWidth;
protected static final int rowcount = 4;
protected final int MAXSELINDEX = rowcount - 1;
protected short curtabindex;
@@ -47,15 +42,11 @@ public abstract class DBLimitedFieldSelection
public DBLimitedFieldSelection(WizardDialog _CurUnoDialog, int iStep, int _iCompPosX, int iCompPosY, int iCompWidth, int _FirstHelpIndex)
{
this.CurUnoDialog = _CurUnoDialog;
- xMSF = CurUnoDialog.xMSF;
FirstHelpIndex = _FirstHelpIndex;
curtabindex = (short) (iStep * 100);
sNoField = CurUnoDialog.m_oResource.getResText(UIConsts.RID_REPORT + 8);
IStep = Integer.valueOf(iStep);
iCompPosX = _iCompPosX;
- ICompPosX = Integer.valueOf(iCompPosX);
- ICompPosY = Integer.valueOf(iCompPosY);
- ICompWidth = Integer.valueOf(iCompWidth);
iCurPosY = iCompPosY;
for (int i = 0; i < rowcount; i++)
{
diff --git a/wizards/com/sun/star/wizards/ui/FieldSelection.java b/wizards/com/sun/star/wizards/ui/FieldSelection.java
index b4998fd..62cfbf0 100644
--- a/wizards/com/sun/star/wizards/ui/FieldSelection.java
+++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java
@@ -34,10 +34,8 @@ public class FieldSelection
protected boolean AppendMode = false;
protected Integer IStep;
- protected int CompPosX;
protected int CompPosY;
protected int CompHeight;
- protected int CompWidth;
private XFieldSelectionListener xFieldSelection;
private int maxfieldcount = 10000000;
@@ -162,10 +160,8 @@ public class FieldSelection
int ShiftButtonCount = 2;
int a = 0;
this.CurUnoDialog = CurUnoDialog;
- this.CompPosX = CompPosX;
this.CompPosY = CompPosY;
this.CompHeight = CompHeight;
- this.CompWidth = CompWidth;
Object btnmoveall = null;
Object btnremoveall = null;
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index ff26cf9..bc4846f 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -67,12 +67,10 @@ public class FilterComponent
static final int SOOPTORMODE = 100;
static final int SOOPTANDMODE = 101;
QueryMetaData oQueryMetaData;
- int iDateTimeFormat;
int iDateFormat;
int iTimeFormat;
private PropertyValue[][] filterconditions;
private short curtabindex;
- XMultiServiceFactory xMSF;
static final int SO_FIRSTFIELDNAME = 1;
static final int SO_SECONDFIELDNAME = 2;
static final int SO_THIRDFIELDNAME = 3;
@@ -367,7 +365,6 @@ public class FilterComponent
public FilterComponent(WizardDialog CurUnoDialog, XMultiServiceFactory _xMSF, int iStep, int iPosX, int iPosY, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID)
{
this.curHelpID = _firstHelpID;
- this.xMSF = _xMSF;
this.IStep = Integer.valueOf(iStep);
curtabindex = UnoDialog.setInitialTabindex(iStep);
@@ -495,7 +492,7 @@ public class FilterComponent
{
iDateFormat = oQueryMetaData.getNumberFormatter().defineNumberFormat("YYYY-MM-DD");
iTimeFormat = oQueryMetaData.getNumberFormatter().defineNumberFormat("HH:MM:SS");
- iDateTimeFormat = oQueryMetaData.getNumberFormatter().defineNumberFormat("YYYY-MM-DD HH:MM:SS");
+ oQueryMetaData.getNumberFormatter().defineNumberFormat("YYYY-MM-DD HH:MM:SS");
}
diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index d0816fd..d7bf664 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -27,7 +27,6 @@ import java.util.ArrayList;
public class SortingComponent
{
- com.sun.star.lang.XMultiServiceFactory xMSF;
WizardDialog CurUnoDialog;
int MaxSortIndex = -1;
static String sNoSorting;
@@ -68,7 +67,6 @@ public class SortingComponent
{
this.CurUnoDialog = CurUnoDialog;
short curtabindex = UnoDialog.setInitialTabindex(iStep);
- xMSF = CurUnoDialog.xMSF;
Integer IStep = Integer.valueOf(iStep);
Integer ICompPosX = Integer.valueOf(iCompPosX);
Integer ICompWidth = Integer.valueOf(iCompWidth);
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index d652b51..a9839bc 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -46,7 +46,6 @@ public class UnoDialog
public XComponent xComponent;
public XInterface xDialogModel;
public XInterface xUnoDialog;
- public XPropertySet xPSetDlg;
public XVclWindowPeer xVclWindowPeer;
public HashMap<String, Integer> ControlList;
public Resource m_oResource;
@@ -67,7 +66,7 @@ public class UnoDialog
xControl = UnoRuntime.queryInterface(XControl.class, xUnoDialog);
XControlModel xControlModel = UnoRuntime.queryInterface(XControlModel.class, xDialogModel);
xControl.setModel(xControlModel);
- xPSetDlg = UnoRuntime.queryInterface(XPropertySet.class, xDialogModel);
+ UnoRuntime.queryInterface(XPropertySet.class, xDialogModel);
xDlgContainer = UnoRuntime.queryInterface(XControlContainer.class, xUnoDialog);
xDlgNames = UnoRuntime.queryInterface(XNameContainer.class, xDialogModel);
xComponent = UnoRuntime.queryInterface(XComponent.class, xUnoDialog);
diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 04b477a..bd2b896 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -57,7 +57,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
private XSingleServiceFactory xSSFRoadmap;
public XIndexContainer xIndexContRoadmap;
private final Resource oWizardResource;
- public String sMsgEndAutopilot;
private final int hid;
private boolean bTerminateListenermustberemoved = true;
@@ -75,7 +74,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
super(xMSF);
hid = hid_;
oWizardResource = new Resource(xMSF, "dbw");
- sMsgEndAutopilot = oWizardResource.getResText(UIConsts.RID_DB_COMMON + 33);
+ oWizardResource.getResText(UIConsts.RID_DB_COMMON + 33);
}
public Resource getResource()
commit 4004c372722ef2ba74d5760a39158cbb64e7b902
Author: Noel Grandin <noel at peralex.com>
Date: Thu Nov 27 13:56:19 2014 +0200
java,wizards: remove unused constants
found by UCDetector
Change-Id: Ic62ec16bceb9ab7b6898f8a469af65ba3884bb51
diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java
index 77002ca..0dd3986 100644
--- a/wizards/com/sun/star/wizards/common/NumericalHelper.java
+++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java
@@ -33,7 +33,6 @@ import com.sun.star.uno.TypeClass;
public class NumericalHelper
{
- public static final int UNKNOWN_TYPE = -32768;
public static final int BYTE_TYPE = 0;
public static final int SHORT_TYPE = 1;
public static final int INT_TYPE = 2;
@@ -44,9 +43,6 @@ public class NumericalHelper
public static final int STRING_TYPE = -1;
public static final int BOOLEAN_TYPE = -2;
public static final int SEQUENCE_TYPE = -3;
- public static final int ASCII_VALUE_0 = 48;
- public static final int ASCII_VALUE_A = 65;
- public static final int COUNT_CHARS_IN_ALPHABET = 26;
private static final int HEX_BASE = 16;
private static final int DEC_BASE = 10;
private static final int ASCII_LETTER_A_OFFSET = 55;
diff --git a/wizards/com/sun/star/wizards/document/GridControl.java b/wizards/com/sun/star/wizards/document/GridControl.java
index ad11636..9fd2d54 100644
--- a/wizards/com/sun/star/wizards/document/GridControl.java
+++ b/wizards/com/sun/star/wizards/document/GridControl.java
@@ -40,7 +40,6 @@ public class GridControl extends Shape
public XGridColumnFactory xGridColumnFactory;
public XPropertySet xPropertySet;
XNameAccess xNameAccess;
- static final String SODEFAULTNAME = "Grid1";
XControlModel xControlModel;
public XComponent xComponent;
diff --git a/wizards/com/sun/star/wizards/query/QuerySummary.java b/wizards/com/sun/star/wizards/query/QuerySummary.java
index f7fb1cd..cd2b37b 100644
--- a/wizards/com/sun/star/wizards/query/QuerySummary.java
+++ b/wizards/com/sun/star/wizards/query/QuerySummary.java
@@ -30,7 +30,6 @@ public class QuerySummary extends QueryMetaData
{
static final protected int RID_QUERY = 2300;
- static final protected int RID_REPORT = 2400;
String sSummary;
Resource oResource;
private final String sSeparator;
diff --git a/wizards/com/sun/star/wizards/query/QueryWizard.java b/wizards/com/sun/star/wizards/query/QueryWizard.java
index e47ffe5..762876f 100644
--- a/wizards/com/sun/star/wizards/query/QueryWizard.java
+++ b/wizards/com/sun/star/wizards/query/QueryWizard.java
@@ -43,7 +43,6 @@ import com.sun.star.wizards.ui.TitlesComponent;
public class QueryWizard extends DatabaseObjectWizard
{
- public static final String SFILLUPFIELDSLISTBOX = "fillUpFieldsListbox";
private static final int SOFIELDSELECTION_PAGE = 1;
private static final int SOSORTING_PAGE = 2;
private static final int SOFILTER_PAGE = 3;
diff --git a/wizards/com/sun/star/wizards/report/ReportLayouter.java b/wizards/com/sun/star/wizards/report/ReportLayouter.java
index 49c3c25..f092b65 100644
--- a/wizards/com/sun/star/wizards/report/ReportLayouter.java
+++ b/wizards/com/sun/star/wizards/report/ReportLayouter.java
@@ -37,7 +37,6 @@ public class ReportLayouter
{
UnoDialog CurUnoDialog;
- static final int SOTXTTITLE = 28;
static final int SOCONTENTLST = 29;
final static public int SOOPTLANDSCAPE = 30;
final static public int SOOPTPORTRAIT = 31;
diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java
index cdc6c10..24e1e71 100644
--- a/wizards/com/sun/star/wizards/table/TableWizard.java
+++ b/wizards/com/sun/star/wizards/table/TableWizard.java
@@ -52,7 +52,6 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener
String serrTableNameexists;
String scomposedtablename;
TableDescriptor curTableDescriptor;
- public static final int SONULLPAGE = 0;
public static final int SOMAINPAGE = 1;
public static final int SOFIELDSFORMATPAGE = 2;
public static final int SOPRIMARYKEYPAGE = 3;
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 4981052..bd8a446 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -54,7 +54,6 @@ public class AggregateComponent extends ControlScroller
int Count;
static final int SOADDROW = 1;
static final int SOREMOVEROW = 2;
- static final int CONTROLROWDIST = 18;
ArrayList<ControlRow> ControlRowVector;
int curHelpID;
int lastHelpIndex;
diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java
index bb57351..ff26cf9 100644
--- a/wizards/com/sun/star/wizards/ui/FilterComponent.java
+++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java
@@ -101,7 +101,6 @@ public class FilterComponent
static final int SO_SECONDBOOLFIELDNAME = 256 + 2;
static final int SO_THIRDBOOLFIELDNAME = 256 + 3;
static final int SO_FOURTHBOOLFIELDNAME = 256 + 4;
- static final int SO_OPTQUERYMODE = 5;
int SOI_MATCHALL = 0;
int SOI_MATCHANY = 1;
int curHelpID;
diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java b/wizards/com/sun/star/wizards/ui/UIConsts.java
index eb5c64d..d62bc55 100644
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list