summaryrefslogtreecommitdiff
path: root/wizards/com/sun/star/wizards/db
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-11-18 12:05:53 +0200
committerNoel Grandin <noel@peralex.com>2014-11-18 12:44:37 +0200
commitf5d1368659fdead1ae7ff5dc625a8c0d56d4da9a (patch)
treece9ab3b2448f3c21d61576acc75ece16bd24c9ea /wizards/com/sun/star/wizards/db
parenta3a57bebcd761a0c0910e482ffdc4a3f11cbcde5 (diff)
java, wizards: remove unused local variables and fields
Change-Id: I77dfcaae8950397e0f22c9a3e744e744055b6cf3
Diffstat (limited to 'wizards/com/sun/star/wizards/db')
-rw-r--r--wizards/com/sun/star/wizards/db/CommandMetaData.java2
-rw-r--r--wizards/com/sun/star/wizards/db/DBMetaData.java6
-rw-r--r--wizards/com/sun/star/wizards/db/RecordParser.java1
-rw-r--r--wizards/com/sun/star/wizards/db/RelationController.java1
-rw-r--r--wizards/com/sun/star/wizards/db/SQLQueryComposer.java3
-rw-r--r--wizards/com/sun/star/wizards/db/TableDescriptor.java1
6 files changed, 3 insertions, 11 deletions
diff --git a/wizards/com/sun/star/wizards/db/CommandMetaData.java b/wizards/com/sun/star/wizards/db/CommandMetaData.java
index 87e26b6ec515..02929b973ff0 100644
--- a/wizards/com/sun/star/wizards/db/CommandMetaData.java
+++ b/wizards/com/sun/star/wizards/db/CommandMetaData.java
@@ -305,7 +305,7 @@ public class CommandMetaData extends DBMetaData
{
exception.printStackTrace(System.err);
}
- Resource oResource = new Resource(xMSF, "Database", "dbw");
+ Resource oResource = new Resource(xMSF, "dbw");
String sMsgNoFieldsFromCommand = oResource.getResText(RID_DB_COMMON + 45);
sMsgNoFieldsFromCommand = JavaTools.replaceSubString(sMsgNoFieldsFromCommand, _commandname, "%NAME");
showMessageBox("ErrorBox", VclWindowPeerAttribute.OK, sMsgNoFieldsFromCommand);
diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java b/wizards/com/sun/star/wizards/db/DBMetaData.java
index a4c49c2e8d79..dc6b0fbb2882 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -668,7 +668,7 @@ public class DBMetaData
private boolean getConnection(XDataSource _dataSource)
{
- Resource oResource = new Resource(xMSF, "Database", "dbw");
+ Resource oResource = new Resource(xMSF, "dbw");
try
{
int iMsg = 0;
@@ -1003,9 +1003,7 @@ public class DBMetaData
{
try
{
- XInterface xInterface = (XInterface) xMSF.createInstance("com.sun.star.ucb.SimpleFileAccess");
- XSimpleFileAccess xSimpleFileAccess = UnoRuntime.queryInterface( XSimpleFileAccess.class, xInterface );
- String storepath = FileAccess.getOfficePath(xMSF, "Temp", xSimpleFileAccess) + "/" + _storename;
+ String storepath = FileAccess.getOfficePath(xMSF, "Temp") + "/" + _storename;
XStorable xStoreable = UnoRuntime.queryInterface( XStorable.class, _xcomponent );
PropertyValue[] oStoreProperties = new PropertyValue[1];
oStoreProperties[0] = Properties.createProperty("FilterName", "writer8");
diff --git a/wizards/com/sun/star/wizards/db/RecordParser.java b/wizards/com/sun/star/wizards/db/RecordParser.java
index 0f83ef1d78c6..cbca3d0eaaa0 100644
--- a/wizards/com/sun/star/wizards/db/RecordParser.java
+++ b/wizards/com/sun/star/wizards/db/RecordParser.java
@@ -191,7 +191,6 @@ public class RecordParser extends QueryMetaData
initializeFieldColumns(_sFieldNames, xColumns);
}
String[] AllQueryFieldNames = xColumns.getElementNames();
- String[] sFieldNames = getFieldNames();
for (int i = 0; i < FieldColumns.length; i++)
{
String sFieldName = FieldColumns[i].getFieldName();
diff --git a/wizards/com/sun/star/wizards/db/RelationController.java b/wizards/com/sun/star/wizards/db/RelationController.java
index d08a13a60d76..a25b7961dd08 100644
--- a/wizards/com/sun/star/wizards/db/RelationController.java
+++ b/wizards/com/sun/star/wizards/db/RelationController.java
@@ -59,7 +59,6 @@ public class RelationController extends CommandName
};
try
{
- String[] sTableNames = super.getCommandMetaData().getTableNames();
ArrayList<String> aReferencedTableVector = new ArrayList<String>();
XResultSet xResultSet = super.getCommandMetaData().xDBMetaData.getExportedKeys((getCatalogName(this)), getSchemaName(), getTableName());
XRow xRow = UnoRuntime.queryInterface(XRow.class, xResultSet);
diff --git a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
index de25e25a06ef..897e4bcd8ff1 100644
--- a/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
+++ b/wizards/com/sun/star/wizards/db/SQLQueryComposer.java
@@ -21,7 +21,6 @@ package com.sun.star.wizards.db;
import com.sun.star.lang.XMultiServiceFactory;
import com.sun.star.beans.*;
import com.sun.star.container.XIndexAccess;
-import com.sun.star.container.XNameAccess;
import com.sun.star.sdbcx.XColumnsSupplier;
import com.sun.star.sdb.XSingleSelectQueryComposer;
import com.sun.star.sdb.XSingleSelectQueryAnalyzer;
@@ -229,8 +228,6 @@ public class SQLQueryComposer
private PropertyValue[][] replaceConditionsByAlias(PropertyValue _filterconditions[][])
{
- XColumnsSupplier columnSup = UnoRuntime.queryInterface(XColumnsSupplier.class, m_xQueryAnalyzer);
- XNameAccess columns = columnSup.getColumns();
for (int n = 0; n < _filterconditions.length; n++)
{
for (int m = 0; m < _filterconditions[n].length; m++)
diff --git a/wizards/com/sun/star/wizards/db/TableDescriptor.java b/wizards/com/sun/star/wizards/db/TableDescriptor.java
index 68b2e95317ea..4b28e84fc83f 100644
--- a/wizards/com/sun/star/wizards/db/TableDescriptor.java
+++ b/wizards/com/sun/star/wizards/db/TableDescriptor.java
@@ -709,7 +709,6 @@ public class TableDescriptor extends CommandMetaData implements XContainerListen
{
ColumnDescriptor oColumnDescriptor = columncontainer.get(i);
XPropertySet xColPropertySet = getByName(oColumnDescriptor.Name);
- Property[] aProperties = xColPropertySet.getPropertySetInfo().getProperties();
int itype;
try
{