diff options
Diffstat (limited to 'wizards/com/sun/star/wizards/ui')
11 files changed, 40 insertions, 58 deletions
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index f6607f47df49..34e52a373bbe 100644 --- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java +++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java @@ -44,28 +44,28 @@ public class AggregateComponent extends ControlScroller "SUM", "AVG", "MIN", "MAX" }; private QueryMetaData CurDBMetaData; - private XButton optDetailQuery; - private XButton optSummaryQuery; + + private String soptDetailQuery; private String soptSummaryQuery; private String slblAggregate; private String slblFieldNames; private String sDuplicateAggregateFunction; private int Count; - int iQueryType; + private final int SOADDROW = 1; private final int SOREMOVEROW = 2; - final int CONTROLROWDIST = 18; + private ArrayList<ControlRow> 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<String> ControlRows; + + + + + + + + + private int curHelpID; private int lastHelpIndex; @@ -78,7 +78,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 @@ -88,7 +88,7 @@ public class AggregateComponent extends ControlScroller 8, HelpIds.getHelpIdString(curHelpID), soptDetailQuery, new Integer(_iPosX), new Integer(iCompPosY - 42), new Short((short) 1), IStep, new Short(curtabindex++), new Integer(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/ButtonList.java b/wizards/com/sun/star/wizards/ui/ButtonList.java index f15f7d26e4ba..d9e005043f8b 100644 --- a/wizards/com/sun/star/wizards/ui/ButtonList.java +++ b/wizards/com/sun/star/wizards/ui/ButtonList.java @@ -58,7 +58,7 @@ public class ButtonList implements XItemEventBroadcaster, XActionListener private 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 171b642efd6e..b738b4af2d8e 100644 --- a/wizards/com/sun/star/wizards/ui/ControlScroller.java +++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java @@ -28,7 +28,7 @@ public abstract class ControlScroller { protected WizardDialog CurUnoDialog; - private XMultiServiceFactory xMSF; + protected int ncurfieldcount; private int nblockincrement; private int nlineincrement; @@ -36,13 +36,13 @@ public abstract class ControlScroller private int ntotfieldcount; private XScrollBar xScrollBar; private ArrayList<PropertyValue[]> scrollfields; - private Integer ICompPosX; + protected int iCompPosX; - private Integer ICompPosY; + protected int iCompPosY; - private Integer ICompWidth; + protected int iCompWidth; - protected Integer ICompHeight; + protected int iCompHeight; private int iStartPosY; protected short curtabindex; @@ -54,7 +54,7 @@ public abstract class ControlScroller protected int curHelpIndex; private String sIncSuffix; protected ArrayList<Object> ControlGroupVector = new ArrayList<Object>(); - protected PeerConfig oTitlePeerConfig; + private class AdjustmentListenerImpl implements com.sun.star.awt.XAdjustmentListener { @@ -82,7 +82,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; @@ -92,10 +91,7 @@ public abstract class ControlScroller IStep = new Integer(iStep); this.iCompPosX = _iCompPosX; this.iCompPosY = _iCompPosY; - this.ICompPosX = new Integer(iCompPosX); - this.ICompPosY = new Integer(iCompPosY); this.iCompWidth = _iCompWidth; - this.ICompWidth = new Integer(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 2aad4c6706de..81119688b061 100644 --- a/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/DBLimitedFieldSelection.java @@ -30,13 +30,13 @@ import com.sun.star.wizards.common.PropertyNames; public abstract class DBLimitedFieldSelection { - private XMultiServiceFactory xMSF; + protected WizardDialog CurUnoDialog; private String sNoField; protected Integer IStep; - private Integer ICompPosX; - private Integer ICompPosY; - private Integer ICompWidth; + + + protected final int rowcount = 4; private final int MAXSELINDEX = rowcount - 1; protected short curtabindex; @@ -47,15 +47,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 = new Integer(iStep); iCompPosX = _iCompPosX; - ICompPosX = new Integer(iCompPosX); - ICompPosY = new Integer(iCompPosY); - ICompWidth = new Integer(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 cb3576413621..7a7047c44038 100644 --- a/wizards/com/sun/star/wizards/ui/FieldSelection.java +++ b/wizards/com/sun/star/wizards/ui/FieldSelection.java @@ -35,10 +35,10 @@ public class FieldSelection protected boolean AppendMode = false; protected Integer IStep; - private int CompPosX; + private int CompPosY; private int CompHeight; - private int CompWidth; + private XFieldSelectionListener xFieldSelection; private int maxfieldcount = 10000000; @@ -174,10 +174,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 2feef4716a77..7bfcc765fc6b 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -72,7 +72,7 @@ public class FilterComponent private int iTimeFormat; private PropertyValue[][] filterconditions; private short curtabindex; - private XMultiServiceFactory xMSF; + private final int SO_FIRSTFIELDNAME = 1; private final int SO_SECONDFIELDNAME = 2; private final int SO_THIRDFIELDNAME = 3; @@ -101,13 +101,8 @@ public class FilterComponent private final int SO_SECONDBOOLFIELDNAME = 256 + 2; private final int SO_THIRDBOOLFIELDNAME = 256 + 3; private final int SO_FOURTHBOOLFIELDNAME = 256 + 4; - int SO_BOOLEANLIST[] = - { - SO_FIRSTBOOLFIELDNAME, SO_SECONDBOOLFIELDNAME, SO_THIRDBOOLFIELDNAME, SO_FOURTHBOOLFIELDNAME - }; - final int SO_OPTQUERYMODE = 5; private int SOI_MATCHALL = 0; private int SOI_MATCHANY = 1; private int curHelpID; @@ -373,7 +368,6 @@ public class FilterComponent public FilterComponent(WizardDialog CurUnoDialog, XMultiServiceFactory _xMSF, int iStep, int iPosX, int iPosY, int iWidth, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID) { this.curHelpID = _firstHelpID; - this.xMSF = _xMSF; this.IStep = Integer.valueOf(iStep); curtabindex = UnoDialog.setInitialTabindex(iStep); diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index ffec486adc4a..67db72753d47 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -26,16 +26,16 @@ import java.util.ArrayList; public class SortingComponent { - private com.sun.star.lang.XMultiServiceFactory xMSF; + private WizardDialog CurUnoDialog; private int MaxSortIndex = -1; - public String[][] FieldNames; + private static String sNoSorting; private static String sSortCriteriaisduplicate; private static String[] sSortHeader = new String[4]; private static String[] sSortAscend = new String[4]; private static String[] sSortDescend = new String[4]; - static short[] bOldSortValues = new short[4]; + private int MAXSORTCRITERIAINDEX = 3; private final int SOFIRSTSORTLST = 0; private final int SOSECSORTLST = 1; @@ -69,7 +69,6 @@ public class SortingComponent { this.CurUnoDialog = CurUnoDialog; short curtabindex = UnoDialog.setInitialTabindex(iStep); - xMSF = CurUnoDialog.xMSF; Integer IStep = new Integer(iStep); Integer ICompPosX = new Integer(iCompPosX); Integer ICompWidth = new Integer(iCompWidth); diff --git a/wizards/com/sun/star/wizards/ui/TitlesComponent.java b/wizards/com/sun/star/wizards/ui/TitlesComponent.java index 0b379f1ec637..4558077dfba7 100644 --- a/wizards/com/sun/star/wizards/ui/TitlesComponent.java +++ b/wizards/com/sun/star/wizards/ui/TitlesComponent.java @@ -34,7 +34,7 @@ public class TitlesComponent extends ControlScroller private String[] fieldnames; private Map<String, String> fieldtitleset; private String[] fieldtitles; - public XTextListener xTextListener; + private final String SOLABELPREFIX = "lblColumnName_"; private final String SOTITLEPREFIX = "lblTitleName_"; @@ -89,7 +89,7 @@ public class TitlesComponent extends ControlScroller private class ControlRow { - PropertyValue[] regproperties; + private XTextComponent xTextComponent; private ControlRow(int _index, int _iCompPosY) diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index 8745987e875b..6f184f1cea30 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -50,7 +50,7 @@ public class UnoDialog implements EventNames public XComponent xComponent; public XInterface xDialogModel; private XInterface xUnoDialog; - private XPropertySet xPSetDlg; + private XVclWindowPeer xVclWindowPeer; public HashMap<String, Integer> ControlList; public Resource m_oResource; @@ -77,7 +77,7 @@ public class UnoDialog implements EventNames 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 a927ebb39964..825eecba647d 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -48,13 +48,13 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL private static final String FINISH_ACTION_PERFORMED = "finishWizard_1"; private static final String CANCEL_ACTION_PERFORMED = "cancelWizard_1"; private static final String HELP_ACTION_PERFORMED = "callHelp"; - public VetoableChangeSupport vetos = new VetoableChangeSupport(this); + private String[] sRightPaneHeaders; private int iButtonWidth = 50; private int nNewStep = 1; private int nOldStep = 1; private int nMaxStep = 1; - protected XItemListener RoadmapItemListener; + private XControl xRoadmapControl; private XItemEventBroadcaster xRoadmapBroadcaster; private String[] sRMItemLabels; @@ -62,7 +62,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL private XSingleServiceFactory xSSFRoadmap; public XIndexContainer xIndexContRoadmap; private Resource oWizardResource; - private String sMsgEndAutopilot; + private int hid; private boolean bTerminateListenermustberemoved = true; @@ -80,7 +80,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL super(xMSF); hid = hid_; oWizardResource = new Resource(xMSF, "Common", "dbw"); - sMsgEndAutopilot = oWizardResource.getResText(UIConsts.RID_DB_COMMON + 33); //new Resource(xMSF,"Common","com"); } diff --git a/wizards/com/sun/star/wizards/ui/event/EventNames.java b/wizards/com/sun/star/wizards/ui/event/EventNames.java index fbb733f522de..0cf0f17ef5fb 100644 --- a/wizards/com/sun/star/wizards/ui/event/EventNames.java +++ b/wizards/com/sun/star/wizards/ui/event/EventNames.java @@ -33,7 +33,7 @@ public interface EventNames public static final String EVENT_KEY_PRESSED = "KPR"; public static final String EVENT_KEY_RELEASED = "KRE"; //mouse events public static final String EVENT_MOUSE_PRESSED = "MPR"; - public static final String EVENT_MOUSE_RELEASED = "MRE"; + public static final String EVENT_MOUSE_ENTERED = "MEN"; public static final String EVENT_MOUSE_EXITED = "MEX"; //other events } |