summaryrefslogtreecommitdiff
path: root/wizards/com
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-04 16:12:55 +0200
committerNoel Grandin <noel@peralex.com>2014-08-05 11:31:49 +0200
commitf124688cfdfbe96ff2be5ab44ea5023725548146 (patch)
tree4874bf2b2504979b9733f200e05b68034c7eaefe /wizards/com
parent36a74fe54a0cd99372ea646af31ce41ac5ec5b08 (diff)
java: remove various unused variables
Change-Id: Id9f30938f594cb6fe73bf40adfffa65ec1b42cd1
Diffstat (limited to 'wizards/com')
-rw-r--r--wizards/com/sun/star/wizards/common/Configuration.java3
-rw-r--r--wizards/com/sun/star/wizards/common/JavaTools.java1
-rw-r--r--wizards/com/sun/star/wizards/common/NumericalHelper.java1
-rw-r--r--wizards/com/sun/star/wizards/db/QueryMetaData.java1
-rw-r--r--wizards/com/sun/star/wizards/db/RecordParser.java1
-rw-r--r--wizards/com/sun/star/wizards/document/OfficeDocument.java1
-rw-r--r--wizards/com/sun/star/wizards/form/FieldLinker.java1
-rw-r--r--wizards/com/sun/star/wizards/form/FormWizard.java1
-rw-r--r--wizards/com/sun/star/wizards/table/ScenarioSelector.java2
-rw-r--r--wizards/com/sun/star/wizards/text/TextDocument.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/AggregateComponent.java1
-rw-r--r--wizards/com/sun/star/wizards/ui/ControlScroller.java3
-rw-r--r--wizards/com/sun/star/wizards/ui/SortingComponent.java2
-rw-r--r--wizards/com/sun/star/wizards/ui/UnoDialog.java10
14 files changed, 2 insertions, 28 deletions
diff --git a/wizards/com/sun/star/wizards/common/Configuration.java b/wizards/com/sun/star/wizards/common/Configuration.java
index 817552ba759f..74e73e7ed33b 100644
--- a/wizards/com/sun/star/wizards/common/Configuration.java
+++ b/wizards/com/sun/star/wizards/common/Configuration.java
@@ -391,7 +391,6 @@ public abstract class Configuration
public static XNameAccess getChildNodebyDisplayName(XNameAccess _xNameAccessNode, String _displayname)
{
- String[] snames = null;
return getChildNodebyDisplayName(_xNameAccessNode, _displayname, PropertyNames.PROPERTY_NAME);
}
@@ -401,7 +400,6 @@ public abstract class Configuration
try
{
snames = _xNameAccessNode.getElementNames();
- String[] sdisplaynames = new String[snames.length];
for (int i = 0; i < snames.length; i++)
{
String curdisplayname = (String) Helper.getUnoPropertyValue(_xNameAccessNode.getByName(snames[i]), _nodename);
@@ -424,7 +422,6 @@ public abstract class Configuration
try
{
snames = _xNameAccessNode.getElementNames();
- String[] sdisplaynames = new String[snames.length];
for (int i = 0; i < snames.length; i++)
{
String curdisplayname = (String) Helper.getUnoPropertyValue(_xNameAccessNode.getByName(snames[i]), _nodename);
diff --git a/wizards/com/sun/star/wizards/common/JavaTools.java b/wizards/com/sun/star/wizards/common/JavaTools.java
index 11656babb1fb..0b83b07ff4c1 100644
--- a/wizards/com/sun/star/wizards/common/JavaTools.java
+++ b/wizards/com/sun/star/wizards/common/JavaTools.java
@@ -335,7 +335,6 @@ public class JavaTools
if (!MainString.equals(PropertyNames.EMPTY_STRING))
{
ArrayList<String> StringVector = new ArrayList<String>();
- String LocString = null;
int iIndex;
do
{
diff --git a/wizards/com/sun/star/wizards/common/NumericalHelper.java b/wizards/com/sun/star/wizards/common/NumericalHelper.java
index 4653099a7721..091aef9e637a 100644
--- a/wizards/com/sun/star/wizards/common/NumericalHelper.java
+++ b/wizards/com/sun/star/wizards/common/NumericalHelper.java
@@ -147,7 +147,6 @@ public class NumericalHelper
{
char retValue = 0;
- boolean hasConversionWarning = false;
TypeObject aTypeObject = getTypeObject(aValue);
switch (aTypeObject.iType)
{
diff --git a/wizards/com/sun/star/wizards/db/QueryMetaData.java b/wizards/com/sun/star/wizards/db/QueryMetaData.java
index a5435e4dae66..ac94dea871fc 100644
--- a/wizards/com/sun/star/wizards/db/QueryMetaData.java
+++ b/wizards/com/sun/star/wizards/db/QueryMetaData.java
@@ -131,7 +131,6 @@ public class QueryMetaData extends CommandMetaData
public void removeSeveralFieldColumnsByDisplayFieldName(String[] _DisplayFieldNames)
{
ArrayList<FieldColumn> oRemainingFieldColumns = new ArrayList<FieldColumn>();
- int a = 0;
for (int n = 0; n < FieldColumns.length; n++)
{
String sDisplayFieldName = FieldColumns[n].getDisplayFieldName();
diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java
index 9f130836aef1..caeb1461597a 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -127,7 +127,6 @@ public class RecordParser extends QueryMetaData
public Object getColumnValue(int ColIndex, int iType)
{
- boolean bResult;
Object oAny = Any.VOID;
switch (iType)
{
diff --git a/wizards/com/sun/star/wizards/document/OfficeDocument.java b/wizards/com/sun/star/wizards/document/OfficeDocument.java
index 06425e5df782..6fbf0da777fd 100644
--- a/wizards/com/sun/star/wizards/document/OfficeDocument.java
+++ b/wizards/com/sun/star/wizards/document/OfficeDocument.java
@@ -129,7 +129,6 @@ public class OfficeDocument
Object oDocument = null;
com.sun.star.frame.XComponentLoader xComponentLoader = null;
- XInterface xInterface = null;
String sURL = "private:factory/" + sDocumentType;
try
diff --git a/wizards/com/sun/star/wizards/form/FieldLinker.java b/wizards/com/sun/star/wizards/form/FieldLinker.java
index 82899b92b532..fa2a89e3200a 100644
--- a/wizards/com/sun/star/wizards/form/FieldLinker.java
+++ b/wizards/com/sun/star/wizards/form/FieldLinker.java
@@ -62,7 +62,6 @@ public class FieldLinker extends DBLimitedFieldSelection
int SOSECLINKLST = 1;
int SOTHIRDLINKLST = 2;
int SOFOURTHLINKLST = 3;
- Integer IListBoxPosX = new Integer(iCompPosX + 6);
sSlaveListHeader = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_FORM + 20, 4); //new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40);
sMasterListHeader = CurUnoDialog.m_oResource.getResArray(UIConsts.RID_FORM + 24, 4);// new String[rowcount];PropertyNames.EMPTY_STRING; //CurUnoDialog.m_oResource.getResText(UIConsts.RID_FORM + 40);
SOLINKLST = new int[]
diff --git a/wizards/com/sun/star/wizards/form/FormWizard.java b/wizards/com/sun/star/wizards/form/FormWizard.java
index f1a2ad047f92..24d1bd4d5c5f 100644
--- a/wizards/com/sun/star/wizards/form/FormWizard.java
+++ b/wizards/com/sun/star/wizards/form/FormWizard.java
@@ -403,7 +403,6 @@ public class FormWizard extends DatabaseObjectWizard
{
String sID = JavaTools.ArrayoutofString(sIncSuffix, "_")[1];
ID = Integer.parseInt(sID);
- int a = 0;
}
}
}
diff --git a/wizards/com/sun/star/wizards/table/ScenarioSelector.java b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
index 5933a68e5fee..53a1346c18b9 100644
--- a/wizards/com/sun/star/wizards/table/ScenarioSelector.java
+++ b/wizards/com/sun/star/wizards/table/ScenarioSelector.java
@@ -222,7 +222,6 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
public void addColumnsToDescriptor()
{
- XNameAccess xNameAccessFieldNode;
String[] fieldnames = getSelectedFieldNames();
for (int i = 0; i < fieldnames.length; i++)
{
@@ -331,7 +330,6 @@ public class ScenarioSelector extends FieldSelection implements XItemListener, X
iduplicate = JavaTools.getDuplicateFieldIndex(NewItems, NewItems[i]);
if (iduplicate != -1)
{
- XNameAccess xNameAccessFieldNode;
String sdisplayname = Desktop.getUniqueName(NewItems, NewItems[iduplicate], PropertyNames.EMPTY_STRING);
FieldDescription curfielddescription = new FieldDescription(xMSF, aLocale, this, sdisplayname, NewItems[iduplicate], imaxcolumnchars);
CurTableWizardUnoDialog.fielditems.put(sdisplayname, curfielddescription);
diff --git a/wizards/com/sun/star/wizards/text/TextDocument.java b/wizards/com/sun/star/wizards/text/TextDocument.java
index 06a885c50072..5ef82e080b1e 100644
--- a/wizards/com/sun/star/wizards/text/TextDocument.java
+++ b/wizards/com/sun/star/wizards/text/TextDocument.java
@@ -316,7 +316,7 @@ public class TextDocument
xComponent = UnoRuntime.queryInterface(XComponent.class, xTextDocument);
XWindow xWindow = xFrame.getComponentWindow();
- xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xFrame.getComponentWindow());
+ xWindowPeer = UnoRuntime.queryInterface(XWindowPeer.class, xWindow);
xMSFDoc = UnoRuntime.queryInterface(XMultiServiceFactory.class, xTextDocument);
xNumberFormatsSupplier = UnoRuntime.queryInterface(XNumberFormatsSupplier.class, xTextDocument);
diff --git a/wizards/com/sun/star/wizards/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
index 604aecd63358..0f1010bc4012 100644
--- a/wizards/com/sun/star/wizards/ui/AggregateComponent.java
+++ b/wizards/com/sun/star/wizards/ui/AggregateComponent.java
@@ -370,7 +370,6 @@ public class AggregateComponent extends ControlScroller
ArrayList<String[]> aggregatevector = new ArrayList<String[]>();
PropertyValue[][] aggregatelist = this.getScrollFieldValues();
PropertyValue[] currowproperties;
- PropertyValue curaggregateproperty;
if (CurDBMetaData.AggregateFieldNames != null)
{
for (int i = 0; i < aggregatelist.length; i++)
diff --git a/wizards/com/sun/star/wizards/ui/ControlScroller.java b/wizards/com/sun/star/wizards/ui/ControlScroller.java
index dfb920ebc09d..8210cce41c1f 100644
--- a/wizards/com/sun/star/wizards/ui/ControlScroller.java
+++ b/wizards/com/sun/star/wizards/ui/ControlScroller.java
@@ -132,7 +132,6 @@ public abstract class ControlScroller
{
try
{
- boolean bisVisible;
ntotfieldcount = _ntotfieldcount;
setCurFieldCount();
nscrollvalue = 0;
@@ -167,9 +166,7 @@ public abstract class ControlScroller
protected void fillupControls(boolean binitialize)
{
- int newindex;
PropertyValue[] oldproperties;
- PropertyValue[] newproperties;
for (int a = 0; a < this.nblockincrement; a++)
{
if (a < ncurfieldcount)
diff --git a/wizards/com/sun/star/wizards/ui/SortingComponent.java b/wizards/com/sun/star/wizards/ui/SortingComponent.java
index e884baa62860..a5c0790c4e94 100644
--- a/wizards/com/sun/star/wizards/ui/SortingComponent.java
+++ b/wizards/com/sun/star/wizards/ui/SortingComponent.java
@@ -72,7 +72,6 @@ public class SortingComponent
xMSF = CurUnoDialog.xMSF;
Integer IStep = new Integer(iStep);
Integer ICompPosX = new Integer(iCompPosX);
- Integer ICompPosY = new Integer(iCompPosY);
Integer ICompWidth = new Integer(iCompWidth);
Integer IListBoxPosX = new Integer(iCompPosX + 6);
@@ -81,7 +80,6 @@ public class SortingComponent
Integer IListBoxWidth = new Integer(iCompWidth - iOptButtonWidth - 12);
Integer IOptButtonPosX = new Integer(IListBoxPosX.intValue() + IListBoxWidth.intValue() + 6);
getResources();
- com.sun.star.awt.XWindow[] xListBoxWindow = new com.sun.star.awt.XWindow[4];
boolean bDoEnable;
String HIDString;
int iCurPosY = iCompPosY;
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index ec3b6b2bc0de..56974cfb6723 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -553,7 +553,6 @@ public class UnoDialog implements EventNames
{
int iCurControlStep = AnyConverter.toInt(getControlProperty(controlname, PropertyNames.PROPERTY_STEP));
int iCurDialogStep = AnyConverter.toInt(Helper.getUnoPropertyValue(this.xDialogModel, PropertyNames.PROPERTY_STEP));
- int iNewStep;
if (bIsVisible)
{
setControlProperty(controlname, PropertyNames.PROPERTY_STEP, new Integer(iCurDialogStep));
@@ -757,7 +756,7 @@ public class UnoDialog implements EventNames
Object oControl = xDlgContainer.getControl(ControlName);
xControl = UnoRuntime.queryInterface(XControl.class, oControl);
XWindowPeer xWindowPeer = xControl.getPeer();
- XVclWindowPeer xVclWindowPeer = UnoRuntime.queryInterface(XVclWindowPeer.class, xControl.getPeer());
+ XVclWindowPeer xVclWindowPeer = UnoRuntime.queryInterface(XVclWindowPeer.class, xWindowPeer);
xVclWindowPeer.setProperty("AutoMnemonics", Boolean.valueOf(bValue));
}
@@ -1041,16 +1040,11 @@ public class UnoDialog implements EventNames
public static int getRedColorShare(int _nColor)
{
int nRed = _nColor / 65536;
- int nRedModulo = _nColor % 65536;
- int nGreen = nRedModulo / 256;
- int nGreenModulo = (nRedModulo % 256);
- int nBlue = nGreenModulo;
return nRed;
}
public static int getGreenColorShare(int _nColor)
{
- int nRed = _nColor / 65536;
int nRedModulo = _nColor % 65536;
int nGreen = nRedModulo / 256;
return nGreen;
@@ -1058,9 +1052,7 @@ public class UnoDialog implements EventNames
public static int getBlueColorShare(int _nColor)
{
- int nRed = _nColor / 65536;
int nRedModulo = _nColor % 65536;
- int nGreen = nRedModulo / 256;
int nGreenModulo = (nRedModulo % 256);
int nBlue = nGreenModulo;
return nBlue;