From d26540bb05b0443e7988da34372c86f88cbf1f6c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 4 Aug 2014 16:27:56 +0200 Subject: java: remove unused fields Change-Id: I6c93864f501f646a8940eac221a88c87b3f75525 --- wizards/com/sun/star/wizards/form/UIControlArranger.java | 3 --- wizards/com/sun/star/wizards/report/GroupFieldHandler.java | 2 -- wizards/com/sun/star/wizards/report/ReportTextDocument.java | 2 -- wizards/com/sun/star/wizards/table/CGCategory.java | 1 - wizards/com/sun/star/wizards/table/CGTable.java | 2 -- wizards/com/sun/star/wizards/table/FieldDescription.java | 3 --- wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java | 4 ---- wizards/com/sun/star/wizards/table/ScenarioSelector.java | 1 - wizards/com/sun/star/wizards/text/TextStyleHandler.java | 4 ---- wizards/com/sun/star/wizards/text/ViewHandler.java | 4 ---- wizards/com/sun/star/wizards/ui/DocumentPreview.java | 1 - wizards/com/sun/star/wizards/ui/PathSelection.java | 2 -- wizards/com/sun/star/wizards/ui/event/DataAwareFields.java | 5 ++--- 13 files changed, 2 insertions(+), 32 deletions(-) (limited to 'wizards') diff --git a/wizards/com/sun/star/wizards/form/UIControlArranger.java b/wizards/com/sun/star/wizards/form/UIControlArranger.java index 6e48ab0d54ae..ff3a16859564 100644 --- a/wizards/com/sun/star/wizards/form/UIControlArranger.java +++ b/wizards/com/sun/star/wizards/form/UIControlArranger.java @@ -123,13 +123,10 @@ public class UIControlArranger private class LayoutRenderer implements ButtonList.IImageRenderer { - int Index = 1; - public Object[] getImageUrls(Object listitem) { int ResId = UIConsts.RID_IMG_FORM + (2 * ((Integer) listitem).intValue()); - Index++; return new Integer[] { new Integer(ResId), new Integer(ResId + 1) diff --git a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java index b7e5ed359055..d6185880a9cd 100644 --- a/wizards/com/sun/star/wizards/report/GroupFieldHandler.java +++ b/wizards/com/sun/star/wizards/report/GroupFieldHandler.java @@ -33,7 +33,6 @@ public class GroupFieldHandler extends FieldSelection private IReportDocument CurReportDocument; private ArrayList GroupFieldVector = new ArrayList(); private QueryMetaData CurDBMetaData; - private WizardDialog oWizardDialog; private static final short MAXSELFIELDS = 4; public GroupFieldHandler(IReportDocument _CurReportDocument, WizardDialog _CurUnoDialog) @@ -44,7 +43,6 @@ public class GroupFieldHandler extends FieldSelection try { - this.oWizardDialog = _CurUnoDialog; this.CurReportDocument = _CurReportDocument; this.CurDBMetaData = CurReportDocument.getRecordParser(); CurUnoDialog.setControlProperty("lstFields_2", "MultiSelection", Boolean.FALSE); diff --git a/wizards/com/sun/star/wizards/report/ReportTextDocument.java b/wizards/com/sun/star/wizards/report/ReportTextDocument.java index 5204ab1d8178..2c3963b81177 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextDocument.java +++ b/wizards/com/sun/star/wizards/report/ReportTextDocument.java @@ -56,8 +56,6 @@ class ReportTextDocument extends com.sun.star.wizards.text.TextDocument implemen // private XMultiServiceFactory xMSFDoc; private Object ReportPageStyle; private Object FirstPageStyle; - private int PageWidth; - private Rectangle PosSize; // private String ReportFolderName; public ArrayList DBColumnsVector; private RecordTable CurRecordTable; diff --git a/wizards/com/sun/star/wizards/table/CGCategory.java b/wizards/com/sun/star/wizards/table/CGCategory.java index 13e4b843aab8..bdcad65db0f2 100644 --- a/wizards/com/sun/star/wizards/table/CGCategory.java +++ b/wizards/com/sun/star/wizards/table/CGCategory.java @@ -32,7 +32,6 @@ public class CGCategory public String Name; public int Index; - private String[] Tables; private final String CGROOTPATH = "/org.openoffice.Office.TableWizard/TableWizard/"; XMultiServiceFactory xMSF; XNameAccess xNameAccessTablesNode; diff --git a/wizards/com/sun/star/wizards/table/CGTable.java b/wizards/com/sun/star/wizards/table/CGTable.java index 6e10598076b7..21f8a9136666 100644 --- a/wizards/com/sun/star/wizards/table/CGTable.java +++ b/wizards/com/sun/star/wizards/table/CGTable.java @@ -31,8 +31,6 @@ public class CGTable XNameAccess xNameAccessTableNode; public String Index; public String Name; - private Object oconfigView; - private final String CGROOTPATH = "/org.openoffice.Office.TableWizard/TableWizard/"; public CGTable(XMultiServiceFactory _xMSF) { diff --git a/wizards/com/sun/star/wizards/table/FieldDescription.java b/wizards/com/sun/star/wizards/table/FieldDescription.java index 976a2585039c..a1b655b777b2 100644 --- a/wizards/com/sun/star/wizards/table/FieldDescription.java +++ b/wizards/com/sun/star/wizards/table/FieldDescription.java @@ -39,9 +39,6 @@ public class FieldDescription private ArrayList aPropertyValues; // PropertyValue[] aPropertyValues; private Integer Type; - private Integer Scale; - private Integer Precision; - private Boolean DefaultValue; private String Name; private XMultiServiceFactory xMSF; private Locale aLocale; diff --git a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java index 83d33398aab9..7737c02026e7 100644 --- a/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java +++ b/wizards/com/sun/star/wizards/table/PrimaryKeyHandler.java @@ -40,12 +40,9 @@ public class PrimaryKeyHandler implements XFieldSelectionListener private TableWizard CurUnoDialog; private short curtabindex; private final static String SPRIMEKEYMODE = "togglePrimeKeyFields"; - private final static String SSINGLEKEYMODE = "toggleSinglePrimeKeyFields"; - private final static String SSEVERALKEYMODE = "toggleSeveralPrimeKeyFields"; private XRadioButton optAddAutomatically; private XRadioButton optUseExisting; private XRadioButton optUseSeveral; - private XCheckBox chkUsePrimaryKey; private XCheckBox chkcreatePrimaryKey; private XCheckBox chkApplyAutoValueExisting; private XCheckBox chkApplyAutoValueAutomatic; @@ -54,7 +51,6 @@ public class PrimaryKeyHandler implements XFieldSelectionListener private FieldSelection curPrimaryKeySelection; private String[] fieldnames; private TableDescriptor curTableDescriptor; - private int nAutoPrimeKeyDataType; private boolean bAutoPrimaryKeysupportsAutoIncrmentation; private final static String SAUTOMATICKEYFIELDNAME = "ID"; diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java index 53a1346c18b9..f7a808812105 100644 --- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java +++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java @@ -58,7 +58,6 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X private CGCategory oCGCategory; protected CGTable oCGTable; private String SELECTCATEGORY = "selectCategory"; - private int curcategory; protected boolean bcolumnnameislimited; private int imaxcolumnchars; private String smytable; diff --git a/wizards/com/sun/star/wizards/text/TextStyleHandler.java b/wizards/com/sun/star/wizards/text/TextStyleHandler.java index c9225dff8e6b..437b698f19b4 100644 --- a/wizards/com/sun/star/wizards/text/TextStyleHandler.java +++ b/wizards/com/sun/star/wizards/text/TextStyleHandler.java @@ -33,14 +33,10 @@ public class TextStyleHandler { public XStyleFamiliesSupplier xStyleFamiliesSupplier; - private XMultiServiceFactory xMSFDoc; - private XTextDocument xTextDocument; /** Creates a new instance of TextStyleHandler */ public TextStyleHandler(com.sun.star.lang.XMultiServiceFactory xMSF, XTextDocument xTextDocument) { - this.xMSFDoc = xMSF; - this.xTextDocument = xTextDocument; xStyleFamiliesSupplier = UnoRuntime.queryInterface(XStyleFamiliesSupplier.class, xTextDocument); } diff --git a/wizards/com/sun/star/wizards/text/ViewHandler.java b/wizards/com/sun/star/wizards/text/ViewHandler.java index 44f67a90a740..1d333bcccd40 100644 --- a/wizards/com/sun/star/wizards/text/ViewHandler.java +++ b/wizards/com/sun/star/wizards/text/ViewHandler.java @@ -40,16 +40,12 @@ public class ViewHandler { private XTextViewCursorSupplier xTextViewCursorSupplier; - private XMultiServiceFactory xMSFDoc; - private XTextDocument xTextDocument; private XStyleFamiliesSupplier xStyleFamiliesSupplier; private XViewSettingsSupplier xViewSettingsSupplier; /** Creates a new instance of View */ public ViewHandler(XMultiServiceFactory xMSF, XTextDocument xTextDocument) { - this.xMSFDoc = xMSF; - this.xTextDocument = xTextDocument; xTextViewCursorSupplier = UnoRuntime.queryInterface(XTextViewCursorSupplier.class, xTextDocument.getCurrentController()); xViewSettingsSupplier = UnoRuntime.queryInterface(XViewSettingsSupplier.class, xTextDocument.getCurrentController()); xStyleFamiliesSupplier = UnoRuntime.queryInterface(XStyleFamiliesSupplier.class, xTextDocument); diff --git a/wizards/com/sun/star/wizards/ui/DocumentPreview.java b/wizards/com/sun/star/wizards/ui/DocumentPreview.java index 553dde50cc15..2421245db16d 100644 --- a/wizards/com/sun/star/wizards/ui/DocumentPreview.java +++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.java @@ -46,7 +46,6 @@ public class DocumentPreview */ private XComponent xComponent; private XControl xControl; - private int step; private PropertyValue[] loadArgs; private String url; public static final int PREVIEW_MODE = 1; diff --git a/wizards/com/sun/star/wizards/ui/PathSelection.java b/wizards/com/sun/star/wizards/ui/PathSelection.java index f8436f088818..4210383c064d 100644 --- a/wizards/com/sun/star/wizards/ui/PathSelection.java +++ b/wizards/com/sun/star/wizards/ui/PathSelection.java @@ -37,8 +37,6 @@ public class PathSelection public boolean usedPathPicker = false; public XPathSelectionListener xAction; public XTextComponent xSaveTextBox; - private final int CMDSELECTPATH = 1; - private final int TXTSAVEPATH = 1; public static class DialogTypes { diff --git a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java index ceeb902790ac..5f696bade241 100644 --- a/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java +++ b/wizards/com/sun/star/wizards/ui/event/DataAwareFields.java @@ -23,7 +23,7 @@ import com.sun.star.uno.Any; /** * This class is a factory for Value objects for different types of - * memebers. + * members. * Other than some Value implementations classes this class contains static * type conversion methods and factory methods. * @@ -33,7 +33,6 @@ public class DataAwareFields { private static final String TRUE = "true"; - private static final String FALSE = "false"; /** * returns a Value Object which sets and gets values @@ -82,7 +81,7 @@ public class DataAwareFields /** * an abstract implementation of DataAware.Value to access - * object memebers (fields) usign reflection. + * object members (fields) using reflection. */ private static abstract class FieldValue implements DataAware.Value { -- cgit v1.2.3