diff options
Diffstat (limited to 'wizards/com/sun/star/wizards/ui')
8 files changed, 5 insertions, 36 deletions
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() |