diff options
author | Noel Grandin <noel@peralex.com> | 2014-11-18 12:05:53 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2014-11-18 12:44:37 +0200 |
commit | f5d1368659fdead1ae7ff5dc625a8c0d56d4da9a (patch) | |
tree | ce9ab3b2448f3c21d61576acc75ece16bd24c9ea /wizards/com/sun/star/wizards/ui | |
parent | a3a57bebcd761a0c0910e482ffdc4a3f11cbcde5 (diff) |
java, wizards: remove unused local variables and fields
Change-Id: I77dfcaae8950397e0f22c9a3e744e744055b6cf3
Diffstat (limited to 'wizards/com/sun/star/wizards/ui')
5 files changed, 7 insertions, 14 deletions
diff --git a/wizards/com/sun/star/wizards/ui/DocumentPreview.java b/wizards/com/sun/star/wizards/ui/DocumentPreview.java index d989b10224fc..4d7cfeb90427 100644 --- a/wizards/com/sun/star/wizards/ui/DocumentPreview.java +++ b/wizards/com/sun/star/wizards/ui/DocumentPreview.java @@ -37,10 +37,6 @@ public class DocumentPreview * The frame service which is used to show the preview */ private XFrame xFrame; - /** - * The content component of the frame. - */ - private XComponent xComponent; private final XControl xControl; private PropertyValue[] loadArgs; private String url; @@ -78,7 +74,7 @@ public class DocumentPreview loadArgs = lArgs; XComponentLoader xCompLoader = UnoRuntime.queryInterface(XComponentLoader.class, xFrame); xFrame.activate(); - return xComponent = xCompLoader.loadComponentFromURL(url, "_self", 0, loadArgs); + return xCompLoader.loadComponentFromURL(url, "_self", 0, loadArgs); } public void reload(XMultiServiceFactory xmsf) throws com.sun.star.lang.IllegalArgumentException, IOException, CloseVetoException, com.sun.star.uno.Exception diff --git a/wizards/com/sun/star/wizards/ui/FilterComponent.java b/wizards/com/sun/star/wizards/ui/FilterComponent.java index 155a0c12ff97..52b4f5652d13 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -374,7 +374,7 @@ public class FilterComponent /** Creates a new instance of FilterComponent */ - public FilterComponent(WizardDialog CurUnoDialog, XMultiServiceFactory _xMSF, int iStep, int iPosX, int iPosY, int iWidth, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID) + public FilterComponent(WizardDialog CurUnoDialog, XMultiServiceFactory _xMSF, int iStep, int iPosX, int iPosY, int FilterCount, QueryMetaData _oQueryMetaData, int _firstHelpID) { this.curHelpID = _firstHelpID; this.xMSF = _xMSF; diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java index 1d8c3c5057d2..7f9d476da515 100644 --- a/wizards/com/sun/star/wizards/ui/SortingComponent.java +++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java @@ -105,7 +105,7 @@ public class SortingComponent }); //Short.valueOf((short) (17+i*4)) HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 1); - XRadioButton xRadioButtonAsc = CurUnoDialog.insertRadioButton("optAscend" + Integer.toString(i + 1), 0, new String[] + CurUnoDialog.insertRadioButton("optAscend" + Integer.toString(i + 1), 0, new String[] { PropertyNames.PROPERTY_ENABLED, 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, "Tag", PropertyNames.PROPERTY_WIDTH }, new Object[] @@ -114,7 +114,7 @@ public class SortingComponent }); //, Short.valueOf((short) (18+i*4)) HIDString = HelpIds.getHelpIdString(FirstHelpIndex + 2); - XRadioButton xRadioButtonDesc = CurUnoDialog.insertRadioButton("optDescend" + Integer.toString(i + 1), 0, new String[] + CurUnoDialog.insertRadioButton("optDescend" + Integer.toString(i + 1), 0, new String[] { PropertyNames.PROPERTY_ENABLED, 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, "Tag", PropertyNames.PROPERTY_WIDTH }, new Object[] diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index 1f53e451875c..6ba5822c61c2 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -504,7 +504,7 @@ public class UnoDialog implements EventNames /** * The problem with setting the visibility of controls is that changing the current step * of a dialog will automatically make all controls visible. The PropertyNames.PROPERTY_STEP property always wins against - * the property "visible". Therfor a control meant to be invisible is placed on a step far far away. + * the property "visible". Therefore a control meant to be invisible is placed on a step far far away. * Afterwards the step property of the dialog has to be set with "repaintDialogStep". As the performance * of that method is very bad it should be used only once for all controls * @param controlname the name of the control @@ -514,7 +514,6 @@ public class UnoDialog implements EventNames { try { - int iCurControlStep = AnyConverter.toInt(getControlProperty(controlname, PropertyNames.PROPERTY_STEP)); int iCurDialogStep = AnyConverter.toInt(Helper.getUnoPropertyValue(this.xDialogModel, PropertyNames.PROPERTY_STEP)); if (bIsVisible) { @@ -664,7 +663,6 @@ public class UnoDialog implements EventNames { createWindowPeer(); } - XVclWindowPeer xVclWindowPeer = UnoRuntime.queryInterface(XVclWindowPeer.class, xWindowPeer); xDialog = UnoRuntime.queryInterface(XDialog.class, xUnoDialog); this.xWindow.setVisible(true); } @@ -884,7 +882,6 @@ public class UnoDialog implements EventNames */ public static String getDisplayProperty(Object oControlModel) { - XServiceInfo xServiceInfo = UnoRuntime.queryInterface(XServiceInfo.class, oControlModel); int itype = getControlModelType(oControlModel); return getDisplayProperty(itype); } @@ -938,7 +935,7 @@ public class UnoDialog implements EventNames public void addResourceHandler(String _Unit, String _Module) { - m_oResource = new Resource(xMSF, _Unit, _Module); + m_oResource = new Resource(xMSF, _Module); } public static short setInitialTabindex(int _istep) diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java index 81d05e722140..abc15222fddd 100644 --- a/wizards/com/sun/star/wizards/ui/WizardDialog.java +++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java @@ -78,7 +78,7 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL { super(xMSF); hid = hid_; - oWizardResource = new Resource(xMSF, "Common", "dbw"); + oWizardResource = new Resource(xMSF, "dbw"); sMsgEndAutopilot = oWizardResource.getResText(UIConsts.RID_DB_COMMON + 33); } |