summaryrefslogtreecommitdiff
path: root/wizards
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-11-27 14:08:09 +0200
committerNoel Grandin <noel@peralex.com>2014-11-27 14:19:35 +0200
commit2eb6f15102c8ea2374ae8fa19e5ac9693a4ee05e (patch)
tree66120ab9b702bd12df7a5186785c0c15f9305b85 /wizards
parent4004c372722ef2ba74d5760a39158cbb64e7b902 (diff)
java,wizards: remove unread fields
found by UCDetector Change-Id: Ia98606a98b998a224f821f2e673e788fb0ecf7d1
Diffstat (limited to 'wizards')
-rw-r--r--wizards/com/sun/star/wizards/common/FileAccess.java3
-rw-r--r--wizards/com/sun/star/wizards/common/Helper.java1
-rw-r--r--wizards/com/sun/star/wizards/common/NumericalHelper.java3
-rw-r--r--wizards/com/sun/star/wizards/common/SystemDialog.java12
-rw-r--r--wizards/com/sun/star/wizards/db/CommandMetaData.java2
-rw-r--r--wizards/com/sun/star/wizards/db/CommandName.java3
-rw-r--r--wizards/com/sun/star/wizards/db/DBMetaData.java4
-rw-r--r--wizards/com/sun/star/wizards/db/RecordParser.java3
-rw-r--r--wizards/com/sun/star/wizards/db/TypeInspector.java8
-rw-r--r--wizards/com/sun/star/wizards/document/Control.java3
-rw-r--r--wizards/com/sun/star/wizards/document/DatabaseControl.java2
-rw-r--r--wizards/com/sun/star/wizards/document/FormHandler.java5
-rw-r--r--wizards/com/sun/star/wizards/form/FormConfiguration.java3
-rw-r--r--wizards/com/sun/star/wizards/query/CallQueryWizard.java3
-rw-r--r--wizards/com/sun/star/wizards/report/Dataimport.java3
-rw-r--r--wizards/com/sun/star/wizards/report/RecordTable.java4
-rw-r--r--wizards/com/sun/star/wizards/report/ReportTextDocument.java1
-rw-r--r--wizards/com/sun/star/wizards/report/ReportTextImplementation.java6
-rw-r--r--wizards/com/sun/star/wizards/reportbuilder/layout/DesignTemplate.java4
-rw-r--r--wizards/com/sun/star/wizards/table/CallTableWizard.java5
-rw-r--r--wizards/com/sun/star/wizards/table/Finalizer.java3
-rw-r--r--wizards/com/sun/star/wizards/table/TableWizard.java3
-rw-r--r--wizards/com/sun/star/wizards/text/TextDocument.java23
-rw-r--r--wizards/com/sun/star/wizards/text/TextTableHandler.java5
-rw-r--r--wizards/com/sun/star/wizards/ui/AggregateComponent.java7
-rw-r--r--wizards/com/sun/star/wizards/ui/ControlScroller.java8
-rw-r--r--wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java9
-rw-r--r--wizards/com/sun/star/wizards/ui/FieldSelection.java4
-rw-r--r--wizards/com/sun/star/wizards/ui/FilterComponent.java5
-rw-r--r--wizards/com/sun/star/wizards/ui/SortingComponent.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog.java3
-rw-r--r--wizards/com/sun/star/wizards/ui/WizardDialog.java3
32 files changed, 29 insertions, 124 deletions
diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java b/wizards/com/sun/star/wizards/common/FileAccess.java
index ee82635007e1..63a531874625 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 61b7c3b7bad2..58f83cdda243 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 0dd3986db510..7505b7b444dc 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 300bcdcd1aa4..e5fefd498b3d 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 61534651031c..9e7797c7b767 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 1db997976ea9..804c6475ac52 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 7782c84129dc..eaa2d78e1387 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 5e6f19d22d29..649434de2da4 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 c76e326af28d..db30c1669cc2 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 de4aa3d0d5c3..64ed3010e218 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 1b1e07efd2f6..14168115520d 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 7b6c016457b3..340b7d446be5 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 2a5288e8c976..ef46eeb1fc1f 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 a40e70d99a19..0114d871ccee 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 ba3dc223c0ad..1ce0bfd53c3f 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 132cb765de3f..14a8f463337c 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 5daa5e549f53..c4c3813a3f38 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 fff21ad17477..2dea1abfbe58 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 32a0f07841d0..974464a43de3 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 605a79607586..07b830082af3 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 f4cb9d46e23e..1e5832ffe1f2 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 24e1e71ed004..3dd4a3336491 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 e4979265fc81..ecb490739be6 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 91a12677aa73..5ee1b07e8261 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 bd8a4465c117..0b2743441d9c 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 fc4873abde7c..6f4db83dbd0b 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 291f1b41d33e..f6eda577af28 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 b4998fdedc46..62cfbf051fd0 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 ff26cf931ee3..bc4846f899be 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 d0816fd5adc6..d7bf664d301d 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 d652b519c1dd..a9839bcfd7c0 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 04b477affec3..bd2b896880b4 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()