summaryrefslogtreecommitdiff
path: root/qadevOOo
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-10-20 16:09:11 +0100
committerCaolán McNamara <caolanm@redhat.com>2015-10-20 21:18:38 +0100
commitbcd5004c3bb48cd1cfbd185e6ff30d107b5c81b7 (patch)
treea984030c25de452b87490490fc3890518d9d9bf3 /qadevOOo
parent4c7c5fe39aa7dfbc2d87a0d08cdf32dc2e0360e3 (diff)
coverity#1327109 UrF: Unread field
Change-Id: Iee847f2c82c35e5f92e8be29e1f2062085977dbc
Diffstat (limited to 'qadevOOo')
-rw-r--r--qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java22
-rw-r--r--qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java10
-rw-r--r--qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java7
3 files changed, 11 insertions, 28 deletions
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java
index 2ec8e6f3c209..3cded65a1dc6 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ConnectionLineAccessibility.java
@@ -70,9 +70,7 @@ import util.utils;
public class ConnectionLineAccessibility extends TestCase
{
XWindow xWindow = null;
- Object oDBSource = null;
String aFile = "";
- XConnection connection = null;
XIsolatedConnection isolConnection = null;
XComponent QueryComponent = null;
String user = "";
@@ -98,13 +96,9 @@ public class ConnectionLineAccessibility extends TestCase
{
XInterface oObj = null;
- Object oDBSource = null;
- Object newQuery = null;
- XStorable store = null;
-
Param.getMSF().createInstance("com.sun.star.sdb.DatabaseContext");
- oDBSource = Param.getMSF().createInstance("com.sun.star.sdb.DataSource");
- newQuery = Param.getMSF().createInstance("com.sun.star.sdb.QueryDefinition");
+ Object oDBSource = Param.getMSF().createInstance("com.sun.star.sdb.DataSource");
+ Object newQuery = Param.getMSF().createInstance("com.sun.star.sdb.QueryDefinition");
Param.getMSF().createInstance("com.sun.star.awt.Toolkit");
String mysqlURL = (String) Param.get("mysql.url");
@@ -140,22 +134,18 @@ public class ConnectionLineAccessibility extends TestCase
log.println("writing database file ...");
XDocumentDataSource xDDS = UnoRuntime.queryInterface(XDocumentDataSource.class, oDBSource);
- store = UnoRuntime.queryInterface(XStorable.class,
+ XStorable store = UnoRuntime.queryInterface(XStorable.class,
xDDS.getDatabaseDocument());
aFile = utils.getOfficeTemp(Param.getMSF())+"ConnectionLine.odb";
log.println("... filename will be "+aFile);
- store.storeAsURL(aFile,new PropertyValue[]
- {});
+ store.storeAsURL(aFile,new PropertyValue[]{});
log.println("... done");
isolConnection = UnoRuntime.queryInterface(
XIsolatedConnection.class,
oDBSource);
- XConnection connection = null;
- XStatement statement = null;
-
final String tbl_name1 = "tst_table1";
final String tbl_name2 = "tst_table2";
final String col_name1 = "id1";
@@ -163,8 +153,8 @@ public class ConnectionLineAccessibility extends TestCase
util.utils.waitForEventIdle(Param.getMSF());
- connection = isolConnection.getIsolatedConnection(user, password);
- statement = connection.createStatement();
+ XConnection connection = isolConnection.getIsolatedConnection(user, password);
+ XStatement statement = connection.createStatement();
statement.executeUpdate("drop table if exists " + tbl_name1);
statement.executeUpdate("drop table if exists " + tbl_name2);
statement.executeUpdate("create table " + tbl_name1 + " (" +
diff --git a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java
index 515249282368..b7d926e502e4 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/JoinViewAccessibility.java
@@ -95,13 +95,10 @@ public class JoinViewAccessibility extends TestCase {
{
XInterface oObj = null;
- Object newQuery = null;
- XStorable store = null;
-
Param.getMSF().createInstance("com.sun.star.sdb.DatabaseContext");
Object oDBSource = Param.getMSF()
.createInstance("com.sun.star.sdb.DataSource");
- newQuery = Param.getMSF().createInstance(
+ Object newQuery = Param.getMSF().createInstance(
"com.sun.star.sdb.QueryDefinition");
Param.getMSF().createInstance("com.sun.star.awt.Toolkit");
@@ -138,12 +135,11 @@ public class JoinViewAccessibility extends TestCase {
log.println ("writing database file ...");
XDocumentDataSource xDDS = UnoRuntime.queryInterface(XDocumentDataSource.class, oDBSource);
- store = UnoRuntime.queryInterface(XStorable.class,
+ XStorable store = UnoRuntime.queryInterface(XStorable.class,
xDDS.getDatabaseDocument());
aFile = utils.getOfficeTemp (Param.getMSF ())+"JoinView.odb";
log.println ("... filename will be "+aFile);
- store.storeAsURL (aFile,new PropertyValue[]
- {});
+ store.storeAsURL (aFile,new PropertyValue[]{});
log.println ("... done");
isolConnection = UnoRuntime.queryInterface (
diff --git a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java
index b280bac9ba8c..384edb85b47e 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/TableWindowAccessibility.java
@@ -98,13 +98,10 @@ public class TableWindowAccessibility extends TestCase {
PrintWriter log) throws Exception {
XInterface oObj = null;
- Object newQuery = null;
- XStorable store = null;
-
Param.getMSF().createInstance("com.sun.star.sdb.DatabaseContext");
Object oDBSource = Param.getMSF()
.createInstance("com.sun.star.sdb.DataSource");
- newQuery = Param.getMSF().createInstance(
+ Object newQuery = Param.getMSF().createInstance(
"com.sun.star.sdb.QueryDefinition");
Param.getMSF().createInstance("com.sun.star.awt.Toolkit");
@@ -140,7 +137,7 @@ public class TableWindowAccessibility extends TestCase {
log.println("writing database file ...");
XDocumentDataSource xDDS = UnoRuntime.queryInterface(
XDocumentDataSource.class, oDBSource);
- store = UnoRuntime.queryInterface(XStorable.class,
+ XStorable store = UnoRuntime.queryInterface(XStorable.class,
xDDS.getDatabaseDocument());
aFile = utils.getOfficeTemp(Param.getMSF()) + "TableWindow.odb";
log.println("... filename will be " + aFile);