summaryrefslogtreecommitdiff
path: root/qadevOOo/tests/java/mod
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-11-05 14:53:35 +0200
committerNoel Grandin <noel@peralex.com>2015-11-05 14:55:16 +0200
commit3f50c6e050ea922cb720ec88a9f38c991b1906cd (patch)
tree3142aef5dcdb47f4de7b1dab7efa855ce391a477 /qadevOOo/tests/java/mod
parentb73db446ac9681fdfc4ad602c6da7ce3e36a8588 (diff)
java: remove ((unnecessary)) parentheses
Change-Id: I39fbe3a260c8dbfc203662c54eec4db064b88195
Diffstat (limited to 'qadevOOo/tests/java/mod')
-rw-r--r--qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/GenericModelTest.java4
-rw-r--r--qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OComboBoxControl.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/ODatabaseForm.java13
-rw-r--r--qadevOOo/tests/java/mod/_forms/ODateControl.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OEditControl.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OFileControlModel.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OFormattedControl.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OFormsCollection.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OGridControlModel.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OHiddenModel.java4
-rw-r--r--qadevOOo/tests/java/mod/_forms/OImageButtonControl.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OImageControlControl.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OListBoxControl.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/ONumericControl.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OPatternControl.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OScrollBarModel.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java2
-rw-r--r--qadevOOo/tests/java/mod/_forms/OTimeControl.java4
-rw-r--r--qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java3
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXMailMerge.java2
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXTextPortion.java2
-rw-r--r--qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java2
-rw-r--r--qadevOOo/tests/java/mod/_toolkit/TabController.java7
27 files changed, 35 insertions, 42 deletions
diff --git a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
index 321d2901950b..039658e1dfea 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/ODatasourceBrowser.java
@@ -192,7 +192,7 @@ public class ODatasourceBrowser extends TestCase {
}
// get a soffice factory object
- SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
log.println("creating a text document");
xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
index f6797763ebd5..c3fd3f829ac6 100644
--- a/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
+++ b/qadevOOo/tests/java/mod/_forms/GenericModelTest.java
@@ -216,7 +216,7 @@ public class GenericModelTest extends TestCase {
@Override
protected void initialize(TestParameters tParam, PrintWriter log) throws Exception {
log.println("creating a textdocument");
- m_xTextDoc = WriterTools.createTextDoc((tParam.getMSF()));
+ m_xTextDoc = WriterTools.createTextDoc(tParam.getMSF());
m_ConnectionColsed = false;
debug = tParam.getBool(util.PropertyName.DEBUG_IS_ACTIVE);
m_propertiesToSet.clear();
@@ -392,7 +392,7 @@ public class GenericModelTest extends TestCase {
utils.copyFile(xMSF, sourceTestDB, destTestDB);
m_dbTools = new DBTools( xMSF );
- String tmpDir = utils.getOfficeTemp((xMSF));
+ String tmpDir = utils.getOfficeTemp(xMSF);
DBTools.DataSourceInfo srcInf = m_dbTools.newDataSourceInfo();
srcInf.URL = "sdbc:dbase:" + DBTools.dirToUrl(tmpDir);
diff --git a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java
index 2bb3f35d2b51..f95a2340d4d8 100644
--- a/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OCheckBoxControl.java
@@ -91,7 +91,7 @@ public class OCheckBoxControl extends TestCase {
*/
@Override
protected void initialize ( TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory( (Param.getMSF()) );
+ SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() );
log.println( "creating a textdocument" );
xTextDoc = SOF.createTextDoc( null );
}
diff --git a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java
index 010948537d4b..1b5fe16d670b 100644
--- a/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OComboBoxControl.java
@@ -95,7 +95,7 @@ public class OComboBoxControl extends TestCase {
*/
@Override
protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
log.println("creating a textdocument");
xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index d8845e5f5c7f..77fde0139689 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -229,7 +229,7 @@ public class ODatabaseForm extends TestCase {
@Override
protected void initialize(TestParameters tParam, PrintWriter log) throws Exception {
- tmpDir = utils.getOfficeTemp((tParam.getMSF()));
+ tmpDir = utils.getOfficeTemp(tParam.getMSF());
origDB = util.utils.getFullTestDocName("TestDB/testDB.dbf");
@@ -296,7 +296,7 @@ public class ODatabaseForm extends TestCase {
oldF = utils.getFullURL(origDB);
newF = utils.getOfficeTemp(tParam.getMSF()) + tableName +
".dbf";
- } while (!utils.tryOverwriteFile((tParam.getMSF()), oldF, newF) &&
+ } while (!utils.tryOverwriteFile(tParam.getMSF(), oldF, newF) &&
(uniqueSuffix++ < 50));
}
}
@@ -322,7 +322,7 @@ public class ODatabaseForm extends TestCase {
}
log.println("creating a text document");
- xTextDoc = WriterTools.createTextDoc((Param.getMSF()));
+ xTextDoc = WriterTools.createTextDoc(Param.getMSF());
//initialize test table
if (isMySQLDB) {
@@ -439,11 +439,8 @@ public class ODatabaseForm extends TestCase {
formLoader.load();
try {
- oObj = (XForm) AnyConverter.toObject(new Type(XForm.class),
- (FormTools.getForms(
- WriterTools.getDrawPage(
- xTextDoc)))
- .getByName("MyForm"));
+ Object temp1 = FormTools.getForms( WriterTools.getDrawPage(xTextDoc) ).getByName("MyForm");
+ oObj = (XForm) AnyConverter.toObject(new Type(XForm.class), temp1);
XPropertySet xSetProp = UnoRuntime.queryInterface(
XPropertySet.class, oObj);
diff --git a/qadevOOo/tests/java/mod/_forms/ODateControl.java b/qadevOOo/tests/java/mod/_forms/ODateControl.java
index d80597b12982..7d4dfc9e4c18 100644
--- a/qadevOOo/tests/java/mod/_forms/ODateControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ODateControl.java
@@ -94,7 +94,7 @@ public class ODateControl extends TestCase {
*/
@Override
protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
log.println("creating a textdocument");
xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OEditControl.java b/qadevOOo/tests/java/mod/_forms/OEditControl.java
index 4b233ca86347..ae231ace5365 100644
--- a/qadevOOo/tests/java/mod/_forms/OEditControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OEditControl.java
@@ -95,7 +95,7 @@ public class OEditControl extends TestCase {
*/
@Override
protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
log.println("creating a textdocument");
xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java
index 247d56a4a3d8..994e62123e6d 100644
--- a/qadevOOo/tests/java/mod/_forms/OFileControlModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OFileControlModel.java
@@ -94,7 +94,7 @@ public class OFileControlModel extends TestCase {
*/
@Override
protected void initialize(TestParameters tParam, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF());
log.println("creating a draw document");
xDrawDoc = SOF.createDrawDoc(null);
}
diff --git a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java
index 9924e4c1d0e8..11793b31d320 100644
--- a/qadevOOo/tests/java/mod/_forms/OFormattedControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OFormattedControl.java
@@ -91,7 +91,7 @@ public class OFormattedControl extends TestCase {
*/
@Override
protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
log.println("creating a textdocument");
xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java
index 293fcbbf77ed..f608b5d0c7cf 100644
--- a/qadevOOo/tests/java/mod/_forms/OFormsCollection.java
+++ b/qadevOOo/tests/java/mod/_forms/OFormsCollection.java
@@ -77,7 +77,7 @@ public class OFormsCollection extends TestCase {
@Override
protected void initialize(TestParameters tParam, PrintWriter log) throws Exception {
log.println("creating a draw document");
- xDrawDoc = DrawTools.createDrawDoc((tParam.getMSF()));
+ xDrawDoc = DrawTools.createDrawDoc(tParam.getMSF());
}
/**
diff --git a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
index 6995574d6b42..bc9b964fa6b0 100644
--- a/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OGridControlModel.java
@@ -229,7 +229,7 @@ class OGridControlModelold extends TestCase {
*/
@Override
protected void initialize(TestParameters tParam, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF());
log.println("creating a draw document");
xDrawDoc = SOF.createDrawDoc(null);
}
diff --git a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java
index fd6f571df05a..dea7c00583da 100644
--- a/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OGroupBoxControl.java
@@ -73,7 +73,7 @@ public class OGroupBoxControl extends TestCase {
*/
@Override
protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
log.println("creating a textdocument");
xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
index 7b64604d71a3..388447f505b9 100644
--- a/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OHiddenModel.java
@@ -91,7 +91,7 @@ public class OHiddenModel extends TestCase {
*/
@Override
protected void initialize(TestParameters tParam, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((tParam.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(tParam.getMSF());
log.println("creating a draw document");
xDrawDoc = SOF.createDrawDoc(null);
@@ -136,7 +136,7 @@ public class OHiddenModel extends TestCase {
log.println("creating a test environment");
// get a soffice factory object
- SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
String objName = "HiddenControl";
XInterface ctrl = SOF.createControl(xDrawDoc, objName);
diff --git a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java
index 11e67319361e..1f55ac59ec16 100644
--- a/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OImageButtonControl.java
@@ -78,7 +78,7 @@ public class OImageButtonControl extends TestCase {
*/
@Override
protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
log.println("creating a textdocument");
xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java
index a13246adc1a8..d859264e1a45 100644
--- a/qadevOOo/tests/java/mod/_forms/OImageControlControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OImageControlControl.java
@@ -79,7 +79,7 @@ public class OImageControlControl extends TestCase {
*/
@Override
protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
log.println("creating a textdocument");
xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java
index da867ae2cc17..03dac5b1a20b 100644
--- a/qadevOOo/tests/java/mod/_forms/OListBoxControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OListBoxControl.java
@@ -47,7 +47,7 @@ public class OListBoxControl extends TestCase {
@Override
protected void initialize ( TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory( (Param.getMSF()) );
+ SOfficeFactory SOF = SOfficeFactory.getFactory( Param.getMSF() );
log.println( "creating a textdocument" );
xTextDoc = SOF.createTextDoc( null );
}
diff --git a/qadevOOo/tests/java/mod/_forms/ONumericControl.java b/qadevOOo/tests/java/mod/_forms/ONumericControl.java
index f8aa38d974a9..843e5c8a9f3f 100644
--- a/qadevOOo/tests/java/mod/_forms/ONumericControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ONumericControl.java
@@ -94,7 +94,7 @@ public class ONumericControl extends TestCase {
*/
@Override
protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
log.println("creating a textdocument");
xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OPatternControl.java b/qadevOOo/tests/java/mod/_forms/OPatternControl.java
index 80d4b5bebc9d..4c67dabd96ff 100644
--- a/qadevOOo/tests/java/mod/_forms/OPatternControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OPatternControl.java
@@ -94,7 +94,7 @@ public class OPatternControl extends TestCase {
*/
@Override
protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
log.println("creating a textdocument");
xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
index 7c7ea558906a..0fd3ce626d81 100644
--- a/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
+++ b/qadevOOo/tests/java/mod/_forms/ORadioButtonControl.java
@@ -82,7 +82,7 @@ public class ORadioButtonControl extends TestCase {
*/
@Override
protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
log.println("creating a textdocument");
xTextDoc = SOF.createTextDoc(null);
diff --git a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java
index 76a951bb48ef..ddd5d209899d 100644
--- a/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OScrollBarModel.java
@@ -42,7 +42,7 @@ public class OScrollBarModel extends TestCase {
protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
log.println( "creating a textdocument" );
- xTextDoc = WriterTools.createTextDoc((tParam.getMSF()));
+ xTextDoc = WriterTools.createTextDoc(tParam.getMSF());
}
/**
diff --git a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java
index d586a849720f..0a3ec02c6155 100644
--- a/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java
+++ b/qadevOOo/tests/java/mod/_forms/OSpinButtonModel.java
@@ -42,7 +42,7 @@ public class OSpinButtonModel extends TestCase {
protected void initialize( TestParameters tParam, PrintWriter log ) throws Exception {
log.println( "creating a textdocument" );
- xTextDoc = WriterTools.createTextDoc((tParam.getMSF()));
+ xTextDoc = WriterTools.createTextDoc(tParam.getMSF());
}
/**
diff --git a/qadevOOo/tests/java/mod/_forms/OTimeControl.java b/qadevOOo/tests/java/mod/_forms/OTimeControl.java
index 9e0486a0064b..375174149dc8 100644
--- a/qadevOOo/tests/java/mod/_forms/OTimeControl.java
+++ b/qadevOOo/tests/java/mod/_forms/OTimeControl.java
@@ -95,7 +95,7 @@ public class OTimeControl extends TestCase {
*/
@Override
protected void initialize(TestParameters Param, PrintWriter log) throws Exception {
- SOfficeFactory SOF = SOfficeFactory.getFactory((Param.getMSF()));
+ SOfficeFactory SOF = SOfficeFactory.getFactory(Param.getMSF());
log.println("creating a textdocument");
xTextDoc = SOF.createTextDoc(null);
@@ -217,7 +217,7 @@ public class OTimeControl extends TestCase {
textComp.addTextListener(listener);
tEnv.addObjRelation("TestTextListener", listener);
- FormTools.switchDesignOf((Param.getMSF()), xTextDoc);
+ FormTools.switchDesignOf(Param.getMSF(), xTextDoc);
util.utils.waitForEventIdle(Param.getMSF());
return tEnv;
diff --git a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java
index 29a9d0a87002..176d17e39d9a 100644
--- a/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java
+++ b/qadevOOo/tests/java/mod/_sd/SdXCustomPresentationAccess.java
@@ -147,8 +147,7 @@ public class SdXCustomPresentationAccess extends TestCase {
// INDEX : _XNameContainer
log.println( "adding XNameContainerINDEX as mod relation to environment" );
- tEnv.addObjRelation("XNameContainerINDEX",
- (Integer.valueOf(THRCNT)).toString());
+ tEnv.addObjRelation("XNameContainerINDEX", Integer.valueOf(THRCNT).toString());
// INSTANCEn : _XNameContainer; _XNameReplace
log.println( "adding INSTANCEn as mod relation to environment" );
diff --git a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
index cc4d673f7b90..99bf4e08bd26 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXMailMerge.java
@@ -257,7 +257,7 @@ public class SwXMailMerge extends TestCase {
String tmpDatabaseFile = tmpDatabaseUrl + databaseName + ".odb";
System.out.println("try to delete '"+tmpDatabaseFile+"'");
- utils.deleteFile((Param.getMSF()), tmpDatabaseFile);
+ utils.deleteFile(Param.getMSF(), tmpDatabaseFile);
tmpDatabaseUrl = "sdbc:dbase:file:///" + tmpDatabaseUrl ;
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java
index 9a887af483ea..50fc0c532a1c 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortion.java
@@ -117,7 +117,7 @@ public class SwXTextPortion extends TestCase {
XEnumeration oEnum = oEnumA.createEnumeration();
int n = 0;
- while ((oEnum.hasMoreElements())) {
+ while (oEnum.hasMoreElements()) {
param = (XInterface) AnyConverter.toObject(new Type(
XInterface.class), oEnum.nextElement());
log.println("Element Nr.: " + n);
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java
index 5956041a1d4e..b5cf80e3033b 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextPortionEnumeration.java
@@ -115,7 +115,7 @@ public class SwXTextPortionEnumeration extends TestCase {
XEnumerationAccess.class, oText);
XEnumeration oEnum = oEnumA.createEnumeration();
- while ((oEnum.hasMoreElements())) {
+ while (oEnum.hasMoreElements()) {
param = (XInterface) AnyConverter.toObject(new Type(
XInterface.class), oEnum.nextElement());
}
diff --git a/qadevOOo/tests/java/mod/_toolkit/TabController.java b/qadevOOo/tests/java/mod/_toolkit/TabController.java
index b7708046de8b..7f361567f893 100644
--- a/qadevOOo/tests/java/mod/_toolkit/TabController.java
+++ b/qadevOOo/tests/java/mod/_toolkit/TabController.java
@@ -91,11 +91,8 @@ public class TabController extends TestCase {
XForm form = null;
try {
- form = (XForm) AnyConverter.toObject(new Type(XForm.class),
- (FormTools.getForms(
- WriterTools.getDrawPage(
- xTextDoc)))
- .getByName("MyForm"));
+ Object temp = FormTools.getForms( WriterTools.getDrawPage(xTextDoc) ).getByName("MyForm");
+ form = (XForm) AnyConverter.toObject(new Type(XForm.class), temp);
} catch (Exception e) {
log.println("Couldn't get Form");
e.printStackTrace(log);