INTEGRATION: CWS qadev11 (1.1.28); FILE MERGED

2003/09/03 14:59:12 sw 1.1.28.1: #112049#

2 files changed, 9 insertions, 9 deletions

diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java
index a7e0145b6db3..a591260220e7 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePicker.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XFilePicker.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:13:45 $
+ *  last change:$Date: 2003-09-08 11:27:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,9 +61,10 @@
 
 package ifc.ui.dialogs;
 
-import com.sun.star.ui.dialogs.XFilePicker;
 import lib.MultiMethodTest;
 
+import com.sun.star.ui.dialogs.XFilePicker;
+
 /**
 * Testing <code>com.sun.star.ui.XFilePicker</code>
 * interface methods :
diff --git a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java
index 7636efe72aec..f76f65b5abda 100644
--- a/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java
+++ b/qadevOOo/tests/java/ifc/ui/dialogs/_XFilePickerControlAccess.java
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: _XFilePickerControlAccess.java,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change:$Date: 2003-01-27 18:13:45 $
+ *  last change:$Date: 2003-09-08 11:27:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,13 +61,14 @@
 
 package ifc.ui.dialogs;
 
-import com.sun.star.ui.dialogs.XFilePickerControlAccess;
 import lib.MultiMethodTest;
 import lib.Status;
 import lib.StatusException;
 import util.ValueChanger;
 import util.ValueComparer;
 
+import com.sun.star.ui.dialogs.XFilePickerControlAccess;
+
 /**
 * Testing <code>com.sun.star.ui.XFilePickerControlAccess</code>
 * interface methods :
@@ -128,7 +129,7 @@ public class _XFilePickerControlAccess extends MultiMethodTest {
             result = false ;
         }
 
-        tRes.tested("getValue()", true) ;
+        tRes.tested("getValue()", result) ;
     }
 
     /**
@@ -172,13 +173,11 @@ public class _XFilePickerControlAccess extends MultiMethodTest {
     * Has <b>OK</b> status if no runtime exceptions occured.
     */
     public void _getLabel() {
-        boolean result = true ;
 
         try {
             oldLab = oObj.getLabel(cntlID);
         } catch (Exception e) {
             e.printStackTrace(log) ;
-            result = false ;
         }
 
         tRes.tested("getLabel()", oldLab != null) ;