java: remove commented out code

Change-Id: I44e2043e5da23bc9421c03e550ef1d8b7ebaad36

27 files changed, 2 insertions, 260 deletions

diff --git a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
index c19f13fe18fb..0322f4abc7af 100644
--- a/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
+++ b/qadevOOo/tests/java/complex/unoapi/CheckModuleAPI.java
@@ -31,7 +31,6 @@ import helper.BuildEnvTools;
 import helper.ComplexDescGetter;
 import helper.CwsDataExchangeImpl;
 import java.io.File;
-// import java.io.FileFilter;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -127,14 +126,6 @@ public class CheckModuleAPI extends ComplexTestCase
         log.println("exit code of dmake: " + procHdl.getExitCode());
         String test = procHdl.getOutputText();
         test += procHdl.getErrorText();
-//        if (mDebug) {
-//            log.println("---> Output of dmake:");
-//            log.println(procHdl.getOutputText());
-//            log.println("<--- Output of dmake:");
-//            log.println("---> Error output of dmake:");
-//            log.println(procHdl.getErrorText());
-//            log.println("<--- Error output of dmake:");
-//        }
         assure("module '" + module + "' failed", verifyOutput(test), mContinue);
         log.println(utils.getDateTime() + " module '" + module + "': kill existing office...");
 
@@ -309,8 +300,6 @@ public class CheckModuleAPI extends ComplexTestCase
                 while (iterator.hasNext())
                 {
                     String sModuleName = iterator.next();
-                    // String sFilename = mSRC_ROOT; //  + File.separator + sModuleName;
-                    // final File sourceRoot = new File(sFilename);
                     if (doesQaUnoApiFolderExist(mSRC_ROOT, sModuleName))
                     {
                         moduleNames.add(sModuleName);
@@ -347,12 +336,6 @@ public class CheckModuleAPI extends ComplexTestCase
             {
                 final String moduleName = names[i].trim();
 
-//                File sourceRoot = new File(mSRC_ROOT + File.separator + moduleName);
-//                if (!sourceRoot.exists())
-//                {
-//                    sourceRoot = new File(mSRC_ROOT + File.separator + moduleName + ".lnk");
-//                }
-
                 if (doesQaUnoApiFolderExist(mSRC_ROOT, moduleName))
                 {
                     checkModules[i] = "checkModule(" + moduleName + ")";
@@ -361,11 +344,6 @@ public class CheckModuleAPI extends ComplexTestCase
         }
         else
         {
-//            File sourceRoot = new File(mSRC_ROOT + File.separator + module);
-//            if (!sourceRoot.exists())
-//            {
-//                sourceRoot = new File(mSRC_ROOT + File.separator + module + ".lnk");
-//            }
             if (doesQaUnoApiFolderExist(mSRC_ROOT, module))
             {
                 checkModules = new String[]
@@ -478,15 +456,12 @@ public class CheckModuleAPI extends ComplexTestCase
         final File sourceRoot = new File(mSRC_ROOT);
         final File[] sourceTree = sourceRoot.listFiles();
 
-//        assure("Could not find any files in SOURCE_ROOT=" + mSRC_ROOT, sourceTree != null, false);
-
         for (int i = 0; i < sourceTree.length; i++)
         {
             final File moduleName = sourceTree[i];
             String sModuleName = moduleName.getName(); // (String)moduleNames.get(i);
             if (doesQaUnoApiFolderExist(mSRC_ROOT, sModuleName))
             {
-                // addIfQaUnoApiFolderExist(moduleName, moduleNames);
                 moduleNames.add(sModuleName);
             }
         }
@@ -590,32 +565,4 @@ public class CheckModuleAPI extends ComplexTestCase
                 };
     }
 
-//    class _FolderFilter implements FileFilter
-//    {
-
-//        private String mFolderName;
-
-//        public FolderFilter(String folderName)
-//        {
-//            mFolderName = folderName;
-//        }
-
-//        public boolean accept_(File pathname)
-//        {
-
-//            boolean found = false;
-//            if (pathname.isDirectory())
-//            {
-//                if (pathname.getName().equals(mFolderName))
-//                {
-//                    found = true;
-//                }
-//                else if (pathname.getName().equals(mFolderName + ".lnk"))
-//                {
-//                    found = true;
-//                }
-//            }
-//            return found;
-//        }
-//    }
 }
diff --git a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
index 069520652450..66237639a555 100644
--- a/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
+++ b/qadevOOo/tests/java/ifc/accessibility/_XAccessibleComponent.java
@@ -73,13 +73,11 @@ public class _XAccessibleComponent extends MultiMethodTest {
 
         int curX = 0;
 
-        //while (!oObj.containsPoint(new Point(curX, bounds.Y)) && curX < bounds.Width+bounds.X) {
         while (!oObj.containsPoint(new Point(curX, 0)) &&
                (curX < bounds.Width)) {
             curX++;
         }
 
-        //if ((bounds.X <= curX) && (curX < bounds.Width+bounds.X)) {
         if (curX < bounds.Width) {
             log.println("Upper bound of box containsPoint point (" + curX +
                         ",0) - OK");
@@ -91,7 +89,6 @@ public class _XAccessibleComponent extends MultiMethodTest {
 
         curX = 0;
 
-        //while (!oObj.containsPoint(new Point(curX, bounds.Y+bounds.Height - 1))
         while (!oObj.containsPoint(new Point(curX, bounds.Height - 1)) &&
                (curX < bounds.Width)) {
             log.println("containsPoint returns false for (" + curX + "," +
@@ -99,7 +96,6 @@ public class _XAccessibleComponent extends MultiMethodTest {
             curX++;
         }
 
-        //if ((bounds.X <= curX) && (curX < bounds.Width+bounds.X)) {
         if (curX < bounds.Width) {
             log.println("Lower bound of box containsPoint point (" + curX +
                         "," + (bounds.Height - 1) + ") - OK");
@@ -111,13 +107,11 @@ public class _XAccessibleComponent extends MultiMethodTest {
 
         int curY = 0;
 
-        //while (!oObj.containsPoint(new Point(bounds.X, curY)) && curY < bounds.Height+bounds.Y) {
         while (!oObj.containsPoint(new Point(0, curY)) &&
                (curY < bounds.Height)) {
             curY++;
         }
 
-        //if ((bounds.Y <= curY) && (curY < bounds.Height+bounds.Y)) {
         if (curY < bounds.Height) {
             log.println("Left bound of box containsPoint point (0," + curY +
                         ") - OK");
@@ -129,14 +123,11 @@ public class _XAccessibleComponent extends MultiMethodTest {
 
         curY = 0;
 
-        //while (!oObj.containsPoint(new Point(bounds.X+bounds.Width - 1, curY))
-        //       && curY < bounds.Height+bounds.Y) {
         while (!oObj.containsPoint(new Point(bounds.Width - 1, curY)) &&
                (curY < bounds.Height)) {
             curY++;
         }
 
-        //if ((bounds.Y <= curY) && (curY < bounds.Height + bounds.Y)) {
         if (curY < bounds.Height) {
             log.println("Right bound of box containsPoint point (" +
                         (bounds.Width - 1) + "," + curY + ") - OK");
diff --git a/qadevOOo/tests/java/ifc/awt/_XTextComponent.java b/qadevOOo/tests/java/ifc/awt/_XTextComponent.java
index 4d7d3c91ef5e..cce6b8cdecf0 100644
--- a/qadevOOo/tests/java/ifc/awt/_XTextComponent.java
+++ b/qadevOOo/tests/java/ifc/awt/_XTextComponent.java
@@ -241,9 +241,6 @@ public class _XTextComponent extends MultiMethodTest {
     */
     public void _setMaxTextLen() {
         oObj.setMaxTextLen((short)10);
-        //oObj.setText("0123456789ABCDE");
-        //String get = oObj.getText();
-        //tRes.tested("setMaxTextLen()",get.length() == 10);
         tRes.tested("setMaxTextLen()",oObj.getMaxTextLen()==10);
     }
 
diff --git a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
index 1c808d0fed96..a31542c19330 100644
--- a/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
+++ b/qadevOOo/tests/java/ifc/beans/_XPropertySet.java
@@ -591,9 +591,6 @@ public class _XPropertySet extends MultiMethodTest {
             if (name.startsWith("Line")) isWritable = false;
             if (name.startsWith("TextWriting")) isWritable = false;
 
-            //if (name.equals("xinterfaceA") || name.equals("xtypeproviderA")
-            //|| name.equals("arAnyA")) isWritable=false;
-
             if ( isWritable && isNotNull ) canChange = isChangeable(name);
 
             if ( isWritable && isNotNull && isBound && canChange) {
diff --git a/qadevOOo/tests/java/ifc/document/_Settings.java b/qadevOOo/tests/java/ifc/document/_Settings.java
index 7d6c3937a7d4..c1f5e3ec0cd0 100644
--- a/qadevOOo/tests/java/ifc/document/_Settings.java
+++ b/qadevOOo/tests/java/ifc/document/_Settings.java
@@ -23,10 +23,6 @@ import com.sun.star.i18n.XForbiddenCharacters;
 import com.sun.star.uno.UnoRuntime;
 import java.lang.reflect.Method;
 
-//import java.awt.print.PrinterJob;
-
-//import javax.print.PrintService;
-
 import lib.MultiPropertyTest;
 import lib.Status;
 import lib.StatusException;
@@ -86,7 +82,6 @@ public class _Settings extends MultiPropertyTest {
                 "Cannot execute test with current Java version (Java 1.4 required) " +
                 javaVersion + ": " + ex.getMessage()));
         }
-//        PrintService[] services = PrinterJob.lookupPrintServices();
 
         if (oServices.length > 1) {
             testProperty("PrinterName", getPrinterNameWithReflection(oServices[0]),
diff --git a/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java b/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java
index 62a56e1d1a56..4b6409845b0d 100644
--- a/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java
+++ b/qadevOOo/tests/java/ifc/document/_XViewDataSupplier.java
@@ -71,8 +71,6 @@ public class _XViewDataSupplier extends MultiMethodTest {
                 oldProps = (PropertyValue[])xAccess.getByIndex(0);
                 newProps = new PropertyValue[oldProps.length];
                 for (int j=0; j<oldProps.length; j++) {
-//                    log.println("Name: " + oldProps[j].Name);
-//                    log.println("Value: " + oldProps[j].Value.toString());
                     newProps[j] = new PropertyValue();
                     newProps[j].Name = oldProps[j].Name;
                     newProps[j].Handle = oldProps[j].Handle;
@@ -97,8 +95,6 @@ public class _XViewDataSupplier extends MultiMethodTest {
             if (count > 0) {
                 oldProps = (PropertyValue[])xAccess.getByIndex(0);
                 for (int j=0; j<oldProps.length; j++) {
-//                    log.println("Name: " + oldProps[j].Name);
-//                    log.println("Value: " + oldProps[j].Value.toString());
                     if (oldProps[j].Name.equals("ViewId")) {
                         retValue = (String)newProps[j].Value;
                     }
diff --git a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
index 3580a021203d..de425ec8dd05 100644
--- a/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
+++ b/qadevOOo/tests/java/ifc/form/validation/_XValidatableFormComponent.java
@@ -123,12 +123,6 @@ public class _XValidatableFormComponent extends MultiMethodTest
 
             Object newValue = ValueChanger.changePValue(oldValue);
             gValues[i] = newValue;
-
-            //            System.out.println("#############################################");
-            //            System.out.println("Name: "+testPropsNames[i]);
-            //            System.out.println("OldValue: "+oldValue);
-            //            System.out.println("NewValue: "+newValue);
-            //            System.out.println("#############################################");
         }
 
         try
diff --git a/qadevOOo/tests/java/ifc/frame/_XFrame.java b/qadevOOo/tests/java/ifc/frame/_XFrame.java
index 41333721f8df..f4c79061cfa2 100644
--- a/qadevOOo/tests/java/ifc/frame/_XFrame.java
+++ b/qadevOOo/tests/java/ifc/frame/_XFrame.java
@@ -19,7 +19,6 @@
 package ifc.frame;
 
 import com.sun.star.awt.XWindow;
-//import com.sun.star.awt.XWindow;
 import com.sun.star.frame.FrameAction;
 import com.sun.star.frame.FrameActionEvent;
 import com.sun.star.frame.XController;
diff --git a/qadevOOo/tests/java/ifc/frame/_XFramesSupplier.java b/qadevOOo/tests/java/ifc/frame/_XFramesSupplier.java
index 6c79de4bed56..ae25433d1277 100644
--- a/qadevOOo/tests/java/ifc/frame/_XFramesSupplier.java
+++ b/qadevOOo/tests/java/ifc/frame/_XFramesSupplier.java
@@ -114,7 +114,6 @@ public class _XFramesSupplier extends MultiMethodTest {
         frames = oObj.getFrames() ;
         if (frames != null) {
             cnt = frames.getCount() ;
-//            if (cnt == 0) result = false ;
             log.println("There are " + cnt + " frames.") ;
         } else {
             log.println("getFrames() returned null !!!") ;
diff --git a/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java b/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
index 44c6a4caa521..4b52450b2064 100644
--- a/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
+++ b/qadevOOo/tests/java/ifc/frame/_XTasksSupplier.java
@@ -41,11 +41,6 @@ public class _XTasksSupplier extends MultiMethodTest {
     * Has <b> OK </b> status .
     */
     public void _getActiveTask() {
-//        XTask active = oObj.getActiveTask() ;
-//        if (active == null)
-//            log.println("There is no active task");
-//        else
-//            log.println("Active task: " + active.getName());
         log.println("DEPRECATED");
 
         tRes.tested("getActiveTask()", true) ;
@@ -54,33 +49,10 @@ public class _XTasksSupplier extends MultiMethodTest {
     /**
     * DEPRECATED. <p>
     * Has <b> OK </b> status.
+    * @deprecated
     */
+    @Deprecated
     public void _getTasks() {
-//        int cnt = 0 ;
-//        boolean result = true ;
-//        XTask task = null ;
-
-//        XEnumerationAccess enumAcc = oObj.getTasks() ;
-//        XEnumeration enum = enumAcc.createEnumeration() ;
-//        while (enum.hasMoreElements()) {
-//            cnt ++ ;
-//            try {
-//                task = (XTask) enum.nextElement() ;
-//            } catch (com.sun.star.container.NoSuchElementException e) {
-//                e.printStackTrace(log);
-//            } catch (com.sun.star.lang.WrappedTargetException e) {
-//                e.printStackTrace(log);
-//            }
-//            if (task == null)
-//                log.println("" + cnt + " task: null !!!") ;
-//            else
-//                log.println("" + cnt + " task: " + task.getName()) ;
-//            result &= (task != null) ;
-//        }
-//        log.println("Totaly tasks: " + cnt) ;
-
-//        if (cnt > 0 && result) tRes.tested("getTasks()", true) ;
-
         log.println("DEPRECATED");
 
         tRes.tested("getTasks()", true);
diff --git a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
index 60ebafa2d1a3..59c983b8aaa5 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XCalendar.java
@@ -110,7 +110,6 @@ public class _XCalendar extends MultiMethodTest {
                           ", Variant: "+ installed_locales[i].Country;
             oObj.loadDefaultCalendar(installed_locales[i]);
             if (oObj.getLoadedCalendar().Default) {
-                //log.println(lang + " ... OK");
             } else {
                 log.println(lang + " ... FAILED");
             }
@@ -135,7 +134,6 @@ public class _XCalendar extends MultiMethodTest {
             calendars[i] = oObj.getAllCalendars(installed_locales[i]);
             count[i] = calendars[i].length-1;
             if (calendars[i].length > 0) {
-                //log.println(lang + " ... OK");
             } else {
                 log.println(lang + " ... FAILED");
             }
@@ -164,7 +162,6 @@ public class _XCalendar extends MultiMethodTest {
                           ", Variant: "+ installed_locales[i].Country;
             oObj.loadCalendar(calendars[i][0], installed_locales[i]);
             if (calendars[i][0].equals(oObj.getLoadedCalendar().Name)) {
-                //log.println(lang + " ... OK");
             } else {
                 log.println(lang + " ... FAILED");
             }
@@ -194,7 +191,6 @@ public class _XCalendar extends MultiMethodTest {
                           ", Variant: "+ installed_locales[i].Country;
             oObj.loadCalendar(calendars[i][0], installed_locales[i]);
             if (calendars[i][0].equals(oObj.getLoadedCalendar().Name)) {
-                //log.println(lang + " ... OK");
             } else {
                 log.println(lang + " ... FAILED");
             }
@@ -222,7 +218,6 @@ public class _XCalendar extends MultiMethodTest {
             oObj.loadCalendar(calendars[i][0], installed_locales[i]);
             String uID = oObj.getUniqueID();
             if (uID.equals(calendars[i][0])) {
-                //log.println(lang + " ... OK");
             } else {
                 log.println(lang + " ... FAILED");
             }
@@ -248,7 +243,6 @@ public class _XCalendar extends MultiMethodTest {
             oObj.setDateTime(newDTime);
             double aDTime = oObj.getDateTime();
             if (aDTime == newDTime) {
-                //log.println(lang + " ... OK");
             } else {
                 log.println(lang + " ... FAILED");
             }
@@ -274,7 +268,6 @@ public class _XCalendar extends MultiMethodTest {
             oObj.setDateTime(newDTime);
             double aDTime = oObj.getDateTime();
             if (aDTime == newDTime) {
-                //log.println(lang + " ... OK");
             } else {
                 log.println(lang + " ... FAILED");
             }
diff --git a/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java b/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java
index 3422d06d4e54..29e9edb22186 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XExtendedTransliteration.java
@@ -27,7 +27,6 @@ import lib.MultiMethodTest;
  */
 public class _XExtendedTransliteration extends MultiMethodTest {
     public XExtendedTransliteration oObj = null;
-//    private Locale loc = new Locale("ja", "JP", "") ;
     private Locale loc = new Locale("en", "US", "") ;
 
     public void before() {
diff --git a/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java b/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java
index 738f4e59e6e6..b9f1ba126c51 100644
--- a/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java
+++ b/qadevOOo/tests/java/ifc/i18n/_XLocaleData.java
@@ -409,34 +409,21 @@ public class _XLocaleData extends MultiMethodTest {
     public boolean goodCalendar(Calendar calendar) {
         boolean good = true;
         for (int i=0;i<calendar.Days.length;i++) {
-            //log.println("Day "+i+"(AbbrevName): "+calendar.Days[i].AbbrevName);
             good &= (! calendar.Days[i].AbbrevName.equals("") );
-            //log.println("Day "+i+"(FullName): "+calendar.Days[i].FullName);
             good &= (! calendar.Days[i].FullName.equals("") );
-            //log.println("Day "+i+"(ID): "+calendar.Days[i].ID);
             good &= (! calendar.Days[i].ID.equals("") );
         }
         for (int i=0;i<calendar.Months.length;i++) {
-            //log.println("Day "+i+"(AbbrevName): "+calendar.Months[i].AbbrevName);
             good &= (! calendar.Months[i].AbbrevName.equals("") );
-            //log.println("Day "+i+"(FullName): "+calendar.Months[i].FullName);
             good &= (! calendar.Months[i].FullName.equals("") );
-            //log.println("Day "+i+"(ID): "+calendar.Months[i].ID);
             good &= (! calendar.Months[i].ID.equals("") );
         }
         for (int i=0;i<calendar.Eras.length;i++) {
-            //log.println("Era "+i+"(AbbrevName): "+calendar.Eras[i].AbbrevName);
             good &= (! calendar.Eras[i].AbbrevName.equals("") );
-            //log.println("Era "+i+"(FullName): "+calendar.Eras[i].FullName);
             good &= (! calendar.Eras[i].FullName.equals("") );
-            //log.println("Era "+i+"(ID): "+calendar.Eras[i].ID);
             good &= (! calendar.Eras[i].ID.equals("") );
         }
-        //log.println("Start of Week: "+calendar.StartOfWeek);
         good &= (! calendar.StartOfWeek.equals("") );
-        //log.println("MinimumNumberOfDaysForFirstWeek: "+calendar.MinimumNumberOfDaysForFirstWeek);
-        //log.println("Default: "+calendar.Default);
-        //log.println("Name: "+calendar.Name);
         good &= (! calendar.Name.equals("") );
         return good;
     }
diff --git a/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java b/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java
index f12a98d45a94..42b70fd89b86 100644
--- a/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java
+++ b/qadevOOo/tests/java/ifc/qadevooo/_SelfTest.java
@@ -20,9 +20,6 @@ package ifc.qadevooo;
 
 import lib.MultiMethodTest;
 
-// import com.sun.star.uno.UnoRuntime;
-// import com.sun.star.uno.XInterface;
-
 /**
 * Testing <code>ifc.qadevooo._SelfTest</code>
 * interface methods:
diff --git a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
index 0b86d1b00bc1..9e27da7462f9 100644
--- a/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
+++ b/qadevOOo/tests/java/ifc/sdbc/_XRowUpdate.java
@@ -140,7 +140,6 @@ public class _XRowUpdate extends MultiMethodTest {
                     row.getBinaryStream(i + 1) ;
                 if (rowData.get(i) instanceof XTextInputStream)
                     row.getCharacterStream(i + 1) ;
-                //if (rowData.get(i) instanceof Object[]) row.getObject(i) ;
 
                 if (!row.wasNull()) {
                     log.println("FAILED") ;
@@ -613,8 +612,6 @@ public class _XRowUpdate extends MultiMethodTest {
                 createInstance("com.sun.star.io.Pipe") ;
 
             oObj.updateObject(idx, newVal) ;
-            //Object getVal = row.getObject(idx) ;
-            //result = UnoRuntime.areSame(newVal, getVal) ;
         } catch (SQLException e) {
             e.printStackTrace(log) ;
             result = false ;
@@ -648,8 +645,6 @@ public class _XRowUpdate extends MultiMethodTest {
                                 createInstance("com.sun.star.io.Pipe") ;
 
             oObj.updateNumericObject(idx, newVal, 0) ;
-            //Object getVal = row.getObject(idx) ;
-            //result = UnoRuntime.areSame(newVal, getVal) ;
         } catch (SQLException e) {
             e.printStackTrace(log) ;
             result = false ;
diff --git a/qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement.java b/qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement.java
index 3bb40649889b..ebd7c8020fa7 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XCellRangeMovement.java
@@ -120,7 +120,6 @@ public class _XCellRangeMovement extends MultiMethodTest {
 
             // catch some sleight of hand threads
             if (oSheet.getCellByPosition(1,21).getValue() == 200){
-                //log.println("Rows closed.");
             }
             else{
                 log.println("Cells were already inserted. "+
diff --git a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
index a5ae8ffee5e6..3f81fd01de8d 100644
--- a/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
+++ b/qadevOOo/tests/java/ifc/sheet/_XRangeSelection.java
@@ -128,22 +128,6 @@ public class _XRangeSelection extends MultiMethodTest {
         clickOnSheet(closer);
         util.utils.shortWait(5000);
 
-//        System.out.println("X: " + closer.X + "    Y: " + closer.Y);
-
-        // just check that we do not have the page instead of the range descriptor
-/*        int childCount = xRoot.getAccessibleContext().getAccessibleChildCount();
-        if (childCount > 3) {// too many children: wrong type
-            throw new StatusException(Status.failed("Could not get the Range Descriptor"));
-        }
-        XAccessible xAcc = null;
-        try {
-            xAcc = xRoot.getAccessibleContext().getAccessibleChild(1);
-        }
-        catch(com.sun.star.lang.IndexOutOfBoundsException e) {
-
-        }
-        accTools.printAccessibleTree(log, xAcc);
-*/
         // open a new range selection
         props[0].Value = "C4:E6";
         oObj.startRangeSelection(props);
@@ -296,8 +280,6 @@ public class _XRangeSelection extends MultiMethodTest {
         }
 
         Point p = xAccessibleComponent.getLocationOnScreen();
-//        System.out.println("ScreenPoint: " + p.X + "   " + p.Y );
-//        System.out.println("WindowPoint: " + posSize.X + "   " + posSize.Y + "   " + posSize.Width + "   " + posSize.Height);
         Point closer = new Point();
         closer.X = p.X + posSize.Width - 2;
         closer.Y = p.Y + 5;
diff --git a/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java b/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java
index 6d80aff4c75e..e72bc2256982 100644
--- a/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java
+++ b/qadevOOo/tests/java/ifc/task/_XInteractionHandler.java
@@ -64,9 +64,6 @@ public class _XInteractionHandler extends MultiMethodTest {
     public void before() {
         request = (XInteractionRequest)
             tEnv.getObjRelation("XInteractionHandler.Request") ;
-
-        //if (request == null)
-        //    throw new StatusException(Status.failed("Reelation not found")) ;
     }
 
     /**
@@ -75,66 +72,6 @@ public class _XInteractionHandler extends MultiMethodTest {
     * Always has <b>SKIPPED.OK</b> status .
     */
     public void _handle() {
-
-        /*
-
-        final XMultiServiceFactory msf = (XMultiServiceFactory)tParam.getMSF() ;
-        SOfficeFactory SOF = SOfficeFactory.getFactory( (XMultiServiceFactory)tParam.getMSF() );
-        XComponent textDoc = null ;
-        try {
-            textDoc = SOF.createTextDoc( null );
-        } catch (com.sun.star.uno.Exception e) {
-            log.println("Can't create Document") ;
-            tRes.tested("handle()", false) ;
-            return ;
-        }
-        final XComponent fTextDoc = textDoc ;
-        final XModel xModelDoc = (XModel)
-            UnoRuntime.queryInterface(XModel.class, textDoc);
-
-        Thread thr = new Thread( new Runnable() {
-            public void run() {
-                try {
-                    Thread.sleep(1000) ;
-                } catch (InterruptedException e ) {}
-
-                //fTextDoc.dispose() ;
-
-                XFrame docFr = xModelDoc.getCurrentController().getFrame() ;
-                docFr.dispose() ;
-
-                /
-                try {
-
-                    Object dsk = msf.createInstance
-                        ("com.sun.star.frame.Desktop");
-
-                    XFrame xDsk = (XFrame)
-                        UnoRuntime.queryInterface(XFrame.class, dsk) ;
-
-                    XFrame fr = xDsk.findFrame("_top", 55) ;
-
-                    XWindow win = fr.getContainerWindow() ;
-
-                    String name = null ;
-                    if (fr != null) {
-                        name = fr.getName() ;
-                        docFr.dispose() ;
-                    }
-
-                } catch (com.sun.star.uno.Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }) ;
-        thr.start() ;
-
-        oObj.handle(request) ;
-        try {
-            thr.join(500) ;
-        } catch (InterruptedException e ) {}
-        */
-
         tRes.tested("handle()", Status.skipped(true)) ;
     }
 }
diff --git a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
index b1a10fe72dfd..52d94530f462 100644
--- a/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
+++ b/qadevOOo/tests/java/ifc/ucb/_XContentProviderManager.java
@@ -227,13 +227,7 @@ public class _XContentProviderManager extends MultiMethodTest {
             }
         }
 
-//        boolean gotTheRightOne = util.ValueComparer.equalValue
-//            (result,contentProvider);
-
         tRes.tested("queryContentProvider()", found);
-
-//        gotTheRightOne = result.equals(contentProvider);
-
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
index 6d13603a4c3a..8fc1c5fae440 100644
--- a/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
+++ b/qadevOOo/tests/java/mod/_dbaccess/OQueryDesign.java
@@ -17,8 +17,6 @@
  */
 package mod._dbaccess;
 
-//import com.sun.star.awt.XControl;
-//import com.sun.star.awt.XControlModel;
 import com.sun.star.container.NoSuchElementException;
 import com.sun.star.lang.WrappedTargetException;
 import com.sun.star.sdbc.SQLException;
@@ -199,9 +197,6 @@ public class OQueryDesign extends TestCase {
         //Adding ObjRelations for XInitialization
         tEnv.addObjRelation("XInitialization.args", params);
 
-        //Object[] ExceptionParams = new Object[3];
-        //ExceptionParams = params;
-        //((PropertyValue) ExceptionParams[1]).Value = Frame;
         Object[] ExceptionParams = new Object[3];
         PropertyValue ExceptionParam1 = new PropertyValue();
         ExceptionParam1.Name = "DataSourceName";
diff --git a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
index 0e81eaafae19..8f42343a2b4a 100644
--- a/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
+++ b/qadevOOo/tests/java/mod/_forms/ODatabaseForm.java
@@ -229,8 +229,6 @@ public class ODatabaseForm extends TestCase {
     private Object dbSrc = null;
 
     protected void initialize(TestParameters tParam, PrintWriter log) {
-        //log.println( "creating a draw document" );
-        //xTextDoc = WriterTools.createTextDoc(t((XMultiServiceFactory) Param.getMSF));
         tmpDir = utils.getOfficeTemp((tParam.getMSF()));
 
         origDB = util.utils.getFullTestDocName("TestDB/testDB.dbf");
@@ -262,7 +260,6 @@ public class ODatabaseForm extends TestCase {
                 PropertyValue[] propInfo = new PropertyValue[1];
                 propInfo[0] = new PropertyValue();
                 propInfo[0].Name = "JavaDriverClass";
-//                propInfo[0].Value = "org.gjt.mm.mysql.Driver";
                 propInfo[0].Value = "util.dddriver.Driver";
                 srcInf.Info = propInfo;
 
diff --git a/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java b/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java
index 66fab02221b5..cd73eed70b72 100644
--- a/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java
+++ b/qadevOOo/tests/java/mod/_shlibloader/uno/DLLComponentLoader.java
@@ -84,7 +84,6 @@ public class DLLComponentLoader extends TestCase {
         // adding object relation for XImplementationLoader ifc test
         tEnv.addObjRelation("ImplementationLoader",
             "com.sun.star.loader.SharedLibrary") ;
-        //String fs = System.getProperty("file.separator");
         String os = (String) Param.get("OS");
         if (os == null || os == "")
             throw new StatusException(
diff --git a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java
index 99c8bfe3ae67..8682e1e3bf61 100644
--- a/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java
+++ b/qadevOOo/tests/java/mod/_svtools/AccessibleTreeListBox.java
@@ -198,13 +198,6 @@ public class AccessibleTreeListBox extends TestCase {
 
         final Object[] fParams = params;
 
-//        tEnv.addObjRelation("EventProducer",
-//            new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer(){
-//                public void fireEvent() {
-//                    fXComp.grabFocus();
-//                }
-//            });
-
         tEnv.addObjRelation("EventProducer",
             new ifc.accessibility._XAccessibleEventBroadcaster.EventProducer(){
                 public void fireEvent() {
diff --git a/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java b/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java
index 67997bfa1f50..ae7298b45412 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXDrawPage.java
@@ -130,9 +130,6 @@ public class SwXDrawPage extends TestCase {
         xDP = XDPSupp.getDrawPage();
         oObj = xDP;
 
-        //dbg.printInterfaces(oObj);
-        //System.exit(0);
-
         log.println( "inserting some Shapes" );
         oShapes = UnoRuntime.queryInterface(XShapes.class, oObj);
         oShapes.add(SOF.createShape(xTextDoc,2000,1500,1000,1000,"Line"));
diff --git a/qadevOOo/tests/java/mod/_sw/SwXTextView.java b/qadevOOo/tests/java/mod/_sw/SwXTextView.java
index 1dd1b45c467b..9c12c67017dd 100644
--- a/qadevOOo/tests/java/mod/_sw/SwXTextView.java
+++ b/qadevOOo/tests/java/mod/_sw/SwXTextView.java
@@ -255,10 +255,6 @@ public class SwXTextView extends TestCase {
                     log.println("ERROR: could not get 'Standard' from drawpage!");
             if (debug){
                 log.println("the draw page contains following elements:");
-//                String[] elements = FormTools.getForms(WriterTools.getDrawPage(xTextDoc)).getElementNames();
-//                for (int i = 0; i< elements.length; i++){
-//                    log.println("Element[" + i + "] :" + elements[i]);
-//                }
             }
             }
             else
diff --git a/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java b/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java
index 92e341886727..c632116fcbfe 100644
--- a/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java
+++ b/qadevOOo/tests/java/mod/_toolkit/MutableTreeNode.java
@@ -48,8 +48,6 @@ public class MutableTreeNode extends TestCase {
      */
     protected void initialize(TestParameters tParam, PrintWriter log) {
         mxMSF = tParam.getMSF();
-//        log.println("creating a textdocument");
-//        xTextDoc = WriterTools.createTextDoc(mxMSF);
     }
 
     /**
diff --git a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
index 87d632cf0bfd..fbfce88507e4 100644
--- a/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
+++ b/qadevOOo/tests/java/mod/_toolkit/UnoTreeControl.java
@@ -66,9 +66,6 @@ public class UnoTreeControl extends TestCase {
     }
 
     protected void cleanup(TestParameters tParam, PrintWriter log) {
-//        log.println("    disposing xTextDoc ");
-
-//        util.DesktopTools.closeDoc(xTextDoc);
     }
 
     protected TestEnvironment createTestEnvironment(TestParameters Param,