diff --git a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java index 8299d4821b5e..b1b9cb6828ef 100644 --- a/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java +++ b/wizards/com/sun/star/wizards/common/PlaceholderTextElement.java @@ -30,7 +30,6 @@ public class PlaceholderTextElement extends TextElement String hint; String placeHolderText; XMultiServiceFactory xmsf; - TextDocument templateDocument; public PlaceholderTextElement(XTextRange textRange, String placeHolderText_, String hint_, XMultiServiceFactory xmsf_) { diff --git a/wizards/com/sun/star/wizards/common/PropertyNames.java b/wizards/com/sun/star/wizards/common/PropertyNames.java index c851b7432b3b..2d7cdd865336 100644 --- a/wizards/com/sun/star/wizards/common/PropertyNames.java +++ b/wizards/com/sun/star/wizards/common/PropertyNames.java @@ -36,7 +36,6 @@ public class PropertyNames public static String PROPERTY_TITLE = "Title"; public static String PROPERTY_BORDER = "Border"; public static String PROPERTY_MOVEABLE = "Moveable"; - public static String PROPERTY_CLOSEABLE = "Closeable"; public static String PROPERTY_ALIGN = "Align"; public static String COMMAND = "Command"; public static String COMMAND_TYPE = "CommandType"; diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java index dc6b0fbb2882..2a8ee9c38311 100644 --- a/wizards/com/sun/star/wizards/db/DBMetaData.java +++ b/wizards/com/sun/star/wizards/db/DBMetaData.java @@ -86,7 +86,6 @@ public class DBMetaData private XOfficeDatabaseDocument xModel; private XPropertySet xDataSourcePropertySet; public String[] DataSourceNames; - public String[] CommandNames; public java.util.ArrayList CommandObjects = new ArrayList(1); public Locale aLocale; public int[] CommandTypes; diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java index c3befda70a70..c5695e515bb3 100644 --- a/wizards/com/sun/star/wizards/db/QueryMetaData.java +++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java @@ -28,7 +28,6 @@ public class QueryMetaData extends CommandMetaData { private SQLQueryComposer oSQLQueryComposer = null; - FieldColumn CurFieldColumn; public String Command; // Vector CommandNamesV; private PropertyValue[][] m_aFilterConditions; /* = new PropertyValue[][] {}; */ diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java index cbca3d0eaaa0..4c11a9b00352 100644 --- a/wizards/com/sun/star/wizards/db/RecordParser.java +++ b/wizards/com/sun/star/wizards/db/RecordParser.java @@ -41,7 +41,6 @@ public class RecordParser extends QueryMetaData { XNameAccess xColumns; - com.sun.star.sdbc.XRow xRow; com.sun.star.sdbc.XRow xResultSetRow; public XResultSet ResultSet; XInterface xRowSet; diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java index 897e4bcd8ff1..da08c290cad0 100644 --- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java +++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java @@ -39,7 +39,6 @@ import java.util.ArrayList; public class SQLQueryComposer { - public XColumnsSupplier xColSuppl; QueryMetaData CurDBMetaData; public XSingleSelectQueryAnalyzer m_xQueryAnalyzer; ArrayList composedCommandNames = new ArrayList(1); diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java index 4b28e84fc83f..5439663699c4 100644 --- a/wizards/com/sun/star/wizards/db/TableDescriptor.java +++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java @@ -66,7 +66,6 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen private String[] sTableFilters = null; private final ArrayList columncontainer; private final ArrayList keycolumncontainer; - public XHierarchicalNameAccess xTableHierarchicalNameAccess; private CommandName ComposedTableName; private XAppend xKeyColAppend; private XColumnsSupplier xKeyColumnSupplier; diff --git a/wizards/com/sun/star/wizards/document/Control.java b/wizards/com/sun/star/wizards/document/Control.java index e9b26954844f..6c0e1c9873e0 100644 --- a/wizards/com/sun/star/wizards/document/Control.java +++ b/wizards/com/sun/star/wizards/document/Control.java @@ -45,10 +45,7 @@ public class Control extends Shape public XPropertySet xPropertySet; XPropertySet xControlPropertySet; XWindowPeer xWindowPeer; - Object oDefaultValue; - GridControl oGridControl; String sServiceName; - XNamed xNamed; static final int SOMAXTEXTSIZE = 50; private int icontroltype; protected XNameContainer xFormName; diff --git a/wizards/com/sun/star/wizards/document/TimeStampControl.java b/wizards/com/sun/star/wizards/document/TimeStampControl.java index c2a5c4a218ba..5bac092cd946 100644 --- a/wizards/com/sun/star/wizards/document/TimeStampControl.java +++ b/wizards/com/sun/star/wizards/document/TimeStampControl.java @@ -38,7 +38,6 @@ public class TimeStampControl extends DatabaseControl DatabaseControl oDateControl; DatabaseControl oTimeControl; Resource oResource; - XShapes xGroupShapes = null; double nreldatewidth; double nreltimewidth; int nTimeWidth; diff --git a/wizards/com/sun/star/wizards/form/Finalizer.java b/wizards/com/sun/star/wizards/form/Finalizer.java index ee994b4dfddd..c1ed3a03db70 100644 --- a/wizards/com/sun/star/wizards/form/Finalizer.java +++ b/wizards/com/sun/star/wizards/form/Finalizer.java @@ -36,7 +36,6 @@ public class Finalizer WizardDialog CurUnoDialog; short curtabindex; XRadioButton optModifyForm; - XRadioButton optWorkWithForm; XTextComponent txtFormName; FormDocument oFormDocument; diff --git a/wizards/com/sun/star/wizards/query/CallQueryWizard.java b/wizards/com/sun/star/wizards/query/CallQueryWizard.java index 181b67def1b8..a40e70d99a19 100644 --- a/wizards/com/sun/star/wizards/query/CallQueryWizard.java +++ b/wizards/com/sun/star/wizards/query/CallQueryWizard.java @@ -57,7 +57,6 @@ public class CallQueryWizard { private PropertyValue[] m_wizardContext; public String Command; - public final Integer CommandType = com.sun.star.sdb.CommandType.QUERY; /** The constructor of the inner class has a XMultiServiceFactory parameter. * @param i_serviceFactory A special service factory could be introduced while initializing. diff --git a/wizards/com/sun/star/wizards/report/DBColumn.java b/wizards/com/sun/star/wizards/report/DBColumn.java index d122637fc551..d0a039fdd830 100644 --- a/wizards/com/sun/star/wizards/report/DBColumn.java +++ b/wizards/com/sun/star/wizards/report/DBColumn.java @@ -47,13 +47,10 @@ public class DBColumn public XCell xValCell; public XTextRange xValTextCell; public XTextCursor xValCellCursor; - public XNumberFormats xValCellNumberFormats; public XCell xNameCell; public XTextRange xNameTextCell; public boolean bAlignLeft; - public Object DefaultValue; public String CharFontName; - public int FormatKey; public PropertyState PropertyState; public int ValColumn = 1; public int ValRow = 0; @@ -63,7 +60,6 @@ public class DBColumn private XCellRange xCellRange; public XNamed xTableName; private boolean bIsGroupColumn; - TextDocument oTextDocument; RecordParser CurDBMetaData; RecordTable CurRecordTable; TextTableHandler oTextTableHandler; diff --git a/wizards/com/sun/star/wizards/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index 3eecd4c4d506..ba3dc223c0ad 100644 --- a/wizards/com/sun/star/wizards/report/Dataimport.java +++ b/wizards/com/sun/star/wizards/report/Dataimport.java @@ -34,11 +34,9 @@ public class Dataimport extends UnoDialog2 implements com.sun.star.awt.XActionLi // ReportTextDocument CurReportDocument; IReportDocument CurReportDocument; - static boolean bStopProcess; static String sProgressDBConnection; static String sProgressDataImport; static String sProgressBaseCurRecord; - static String sProgressCurRecord; static String sProgressTitle; static String sStop; diff --git a/wizards/com/sun/star/wizards/report/RecordTable.java b/wizards/com/sun/star/wizards/report/RecordTable.java index f0079b122011..132cb765de3f 100644 --- a/wizards/com/sun/star/wizards/report/RecordTable.java +++ b/wizards/com/sun/star/wizards/report/RecordTable.java @@ -33,8 +33,6 @@ import com.sun.star.wizards.text.ViewHandler; public class RecordTable { - String CurFieldName; - String LabelDescription; public XNamed xTableName; public XCellRange xCellRange; public XTextTable xTextTable; diff --git a/wizards/com/sun/star/wizards/report/ReportFinalizer.java b/wizards/com/sun/star/wizards/report/ReportFinalizer.java index af5ea07deaed..c20e9fd488b9 100644 --- a/wizards/com/sun/star/wizards/report/ReportFinalizer.java +++ b/wizards/com/sun/star/wizards/report/ReportFinalizer.java @@ -37,11 +37,7 @@ public class ReportFinalizer WizardDialog CurUnoDialog; XTextComponent xTitleTextBox; - XTextComponent[] xSaveTextBox = new XTextComponent[2]; - Object chkTemplate; - String TemplatePath; String StoreName; - boolean bfinalaskbeforeOverwrite; String DefaultName; String OldDefaultName; IReportDocument CurReportDocument; diff --git a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java index 8ccf7a64629f..fff21ad17477 100644 --- a/wizards/com/sun/star/wizards/report/ReportTextImplementation.java +++ b/wizards/com/sun/star/wizards/report/ReportTextImplementation.java @@ -129,9 +129,7 @@ public class ReportTextImplementation extends ReportImplementationHelper impleme static String sReportFormNotExisting; static String sMsgHiddenControlMissing; static String sMsgEndAutopilot; - static String sMsgConnectionImpossible; static String sMsgNoConnection; - static String[] ReportMessages = new String[4]; private void initialResources() { diff --git a/wizards/com/sun/star/wizards/table/CGCategory.java b/wizards/com/sun/star/wizards/table/CGCategory.java index 05d3d6cd03a2..d2b649afc383 100644 --- a/wizards/com/sun/star/wizards/table/CGCategory.java +++ b/wizards/com/sun/star/wizards/table/CGCategory.java @@ -30,8 +30,6 @@ import com.sun.star.wizards.common.Configuration; public class CGCategory { - public String Name; - public int Index; private static 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 21f8a9136666..b6c8d1bb34f8 100644 --- a/wizards/com/sun/star/wizards/table/CGTable.java +++ b/wizards/com/sun/star/wizards/table/CGTable.java @@ -29,8 +29,6 @@ public class CGTable XMultiServiceFactory xMSF; XNameAccess xNameAccessFieldsNode; XNameAccess xNameAccessTableNode; - public String Index; - public String Name; public CGTable(XMultiServiceFactory _xMSF) { diff --git a/wizards/com/sun/star/wizards/table/CallTableWizard.java b/wizards/com/sun/star/wizards/table/CallTableWizard.java index 5c4e35d7e9b1..605a79607586 100644 --- a/wizards/com/sun/star/wizards/table/CallTableWizard.java +++ b/wizards/com/sun/star/wizards/table/CallTableWizard.java @@ -58,7 +58,6 @@ public class CallTableWizard private PropertyValue[] m_wizardContext; // public String Command; - public final Integer CommandType = com.sun.star.sdb.CommandType.TABLE; // /** The constructor of the inner class has a XMultiServiceFactory parameter. diff --git a/wizards/com/sun/star/wizards/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index a9a41cadbe08..fdeaed608b7b 100644 --- a/wizards/com/sun/star/wizards/table/FieldFormatter.java +++ b/wizards/com/sun/star/wizards/table/FieldFormatter.java @@ -51,7 +51,6 @@ public class FieldFormatter implements XItemListener XButton btnShiftUp; XButton btnShiftDown; short curtabindex; - String[] fieldnames; String suntitled; Integer IFieldFormatStep; diff --git a/wizards/com/sun/star/wizards/table/TableWizard.java b/wizards/com/sun/star/wizards/table/TableWizard.java index 79069f8abc9c..cdc6c10403c4 100644 --- a/wizards/com/sun/star/wizards/table/TableWizard.java +++ b/wizards/com/sun/star/wizards/table/TableWizard.java @@ -58,7 +58,6 @@ public class TableWizard extends DatabaseObjectWizard implements XTextListener public static final int SOPRIMARYKEYPAGE = 3; public static final int SOFINALPAGE = 4; private String sMsgColumnAlreadyExists = PropertyNames.EMPTY_STRING; - String WizardHeaderText[] = new String[8]; private String m_tableName; diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java index 43b2a56e7acb..8f4bb374387e 100644 --- a/wizards/com/sun/star/wizards/text/TextDocument.java +++ b/wizards/com/sun/star/wizards/text/TextDocument.java @@ -72,7 +72,6 @@ public class TextDocument public XComponent xComponent; public com.sun.star.text.XTextDocument xTextDocument; - public com.sun.star.util.XNumberFormats NumberFormats; public com.sun.star.document.XDocumentProperties m_xDocProps; public com.sun.star.task.XStatusIndicator xProgressBar; public com.sun.star.frame.XFrame xFrame; @@ -82,9 +81,7 @@ public class TextDocument public com.sun.star.util.XNumberFormatsSupplier xNumberFormatsSupplier; public com.sun.star.awt.XWindowPeer xWindowPeer; public int PageWidth; - public int ScaleWidth; public Size DocSize; - public com.sun.star.awt.Rectangle PosSize; public com.sun.star.lang.Locale CharLocale; public XStorable xStorable; diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 308b61874733..49810523f540 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -52,20 +52,10 @@ public class AggregateComponent extends ControlScroller String slblFieldNames; String sDuplicateAggregateFunction; int Count; - int iQueryType; static final int SOADDROW = 1; static final int SOREMOVEROW = 2; static final int CONTROLROWDIST = 18; ArrayList ControlRowVector; - String OPTIONBUTTONDETAILQUERY_ITEM_CHANGED = "toggleComponent"; - String OPTIONBUTTONSUMMARYQUERY_ITEM_CHANGED = "toggleComponent"; - String LISTBOXFUNCTIONS_ACTION_PERFORMED; - String LISTBOXFUNCTIONS_ITEM_CHANGED; - String LISTBOXFIELDNAMES_ACTION_PERFORMED; - String LISTBOXFIELDNAMES_ITEM_CHANGED; - String COMMANDBUTTONPLUS_ACTION_PERFORMED = "addRow"; - String COMMANDBUTTONMINUS_ACTION_PERFORMED = "removeRow"; - ArrayList ControlRows; int curHelpID; int lastHelpIndex; diff --git a/wizards/com/sun/star/wizards/ui/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index 76d06fb18c31..ea6aa95a1fab 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -61,7 +61,6 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener private static final int imageTextLines = 1; private boolean rowSelect = false; public int tabIndex; - public Boolean scaleImages = Boolean.TRUE; private String m_aControlName = "il"; private int m_nCurrentSelection = -1; private int pageStart = 0; diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java index ed9f747ca238..67349aace9ce 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -42,7 +42,6 @@ public abstract class ControlScroller protected int iCompPosY; protected Integer ICompWidth; protected int iCompWidth; - protected Integer ICompHeight; protected int iCompHeight; protected int iStartPosY; protected short curtabindex; @@ -54,7 +53,6 @@ public abstract class ControlScroller protected int curHelpIndex; String sIncSuffix; protected ArrayList ControlGroupVector = new ArrayList(); - protected PeerConfig oTitlePeerConfig; class AdjustmentListenerImpl implements com.sun.star.awt.XAdjustmentListener { diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index b7975e27f7f4..baa1728e85ab 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -101,12 +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; - int SO_BOOLEANLIST[] = - - - { - SO_FIRSTBOOLFIELDNAME, SO_SECONDBOOLFIELDNAME, SO_THIRDBOOLFIELDNAME, SO_FOURTHBOOLFIELDNAME - }; static final int SO_OPTQUERYMODE = 5; int SOI_MATCHALL = 0; int SOI_MATCHANY = 1; diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index 7f9d476da515..9e6df49c6c3e 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -30,13 +30,11 @@ public class SortingComponent com.sun.star.lang.XMultiServiceFactory xMSF; WizardDialog CurUnoDialog; int MaxSortIndex = -1; - public String[][] FieldNames; static String sNoSorting; static String sSortCriteriaisduplicate; static String[] sSortHeader = new String[4]; static String[] sSortAscend = new String[4]; static String[] sSortDescend = new String[4]; - static short[] bOldSortValues = new short[4]; public int MAXSORTCRITERIAINDEX = 3; static final int SOFIRSTSORTLST = 0; static final int SOSECSORTLST = 1; diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java index 14a78155ad95..eb999d09d708 100644 --- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java +++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java @@ -34,7 +34,6 @@ public class TitlesComponent extends ControlScroller public String[] fieldnames; public Map fieldtitleset; public String[] fieldtitles; - public XTextListener xTextListener; static final String SOLABELPREFIX = "lblColumnName_"; static final String SOTITLEPREFIX = "lblTitleName_"; @@ -87,7 +86,6 @@ public class TitlesComponent extends ControlScroller class ControlRow { - PropertyValue[] regproperties; XTextComponent xTextComponent; public ControlRow(int _index, int _iCompPosY) diff --git a/wizards/com/sun/star/wizards/ui/UIConsts.java b/wizards/com/sun/star/wizards/ui/UIConsts.java index 0d2e956b047d..eb5c64d4e6eb 100644 --- a/wizards/com/sun/star/wizards/ui/UIConsts.java +++ b/wizards/com/sun/star/wizards/ui/UIConsts.java @@ -27,9 +27,7 @@ public interface UIConsts int RID_QUERY = 2300; int RID_REPORT = 2400; int RID_TABLE = 2600; - int RID_IMG_REPORT = 1000; int RID_IMG_FORM = 1100; - int RID_IMG_WEB = 1200; Integer INVISIBLESTEP = 99; String INFOIMAGEURL = "private:resource/dbu/image/19205"; String INFOIMAGEURL_HC = "private:resource/dbu/image/19230"; @@ -38,23 +36,13 @@ public interface UIConsts * high tabindex because on every step their taborder must appear at the end */ short SOFIRSTWIZARDNAVITABINDEX = 30000; - Integer INTEGER_8 = 8; Integer INTEGER_12 = 12; - Integer INTEGER_14 = 14; - Integer INTEGER_16 = 16; - Integer INTEGER_40 = 40; - Integer INTEGER_50 = 50; /**Steps of the QueryWizard * */ - int SOFIELDSELECTIONPAGE = 1; - int SOSORTINGPAGE = 2; - int SOFILTERPAGE = 3; - int SOAGGREGATEPAGE = 4; int SOGROUPSELECTIONPAGE = 5; int SOGROUPFILTERPAGE = 6; int SOTITLESPAGE = 7; - int SOSUMMARYPAGE = 8; Integer[] INTEGERS = new Integer[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index 3d80b095e931..fb698318d126 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -50,12 +50,10 @@ import com.sun.star.wizards.ui.event.XWindowListenerAdapter; public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeListener, XTerminateListener, XCompletion { - public VetoableChangeSupport vetos = new VetoableChangeSupport(this); private static final int iButtonWidth = 50; private int nNewStep = 1; private int nOldStep = 1; private int nMaxStep = 1; - protected XItemListener RoadmapItemListener; XItemEventBroadcaster xRoadmapBroadcaster; String[] sRMItemLabels; private Object oRoadmap;