Remove commented code in libs-core/framework

14 files changed, 2 insertions, 109 deletions

diff --git a/framework/qa/complex/api_internal/CheckAPI.java b/framework/qa/complex/api_internal/CheckAPI.java
index be979e9234ac..4539e7a95ce4 100755
--- a/framework/qa/complex/api_internal/CheckAPI.java
+++ b/framework/qa/complex/api_internal/CheckAPI.java
@@ -90,12 +90,6 @@ public class CheckAPI  {
         System.out.println("Start with test");
         // if test is idle for 5 minutes, assume that it hangs and kill it.
         // param.put("TimeOut", new Integer("300000"));
-/*        AppProvider office = (AppProvider)dcl.getInstance("helper.OfficeProvider");
-        Object msf = office.getManager(param);
-        if (msf == null) {
-            failed("Could not connect an Office.");
-        }
-        param.put("ServiceFactory",msf); */
         XMultiServiceFactory xMSF = getMSF();
         Object oObj = null;
         try {
@@ -180,7 +174,6 @@ public class CheckAPI  {
                 }
                 catch(java.lang.InterruptedException e) {}
                 OfficeProvider op = new OfficeProvider();
-                //                op.closeExistingOffice(param, true);
                 xMSF = (XMultiServiceFactory)op.getManager(param);
                 param.put("ServiceFactory",xMSF);
                 try {
diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
index 471f5246b787..b017c7b8c470 100755
--- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
@@ -180,8 +180,6 @@ public class CheckContextMenuInterceptor
                 }
             }
 
-            //  utils.shortWait(10000);
-
             openContextMenu(UnoRuntime.queryInterface(XModel.class, xDrawDoc));
 
             checkHelpEntry();
@@ -231,9 +229,6 @@ public class CheckContextMenuInterceptor
             xWindow = UnoRuntime.queryInterface(XWindow.class, tk.getTopWindow(0));
 
             xRoot = at.getAccessibleObject(xWindow);
-
-//            at.printAccessibleTree((PrintWriter)log, xRoot, param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
-            // at.printAccessibleTree(System.out, xRoot, true);
         }
         catch (com.sun.star.lang.IndexOutOfBoundsException e)
         {
diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java
index 0f385edf0cb0..ae668cbe9209 100755
--- a/framework/qa/complex/desktop/DesktopTerminate.java
+++ b/framework/qa/complex/desktop/DesktopTerminate.java
@@ -31,7 +31,6 @@ import com.sun.star.lang.XMultiServiceFactory;
 import com.sun.star.frame.XDesktop;
 import com.sun.star.uno.UnoRuntime;
 import helper.OfficeProvider;
-//import complex.persistent_window_states.helper.DocumentHandle;
 
 // ---------- junit imports -----------------
 import org.junit.After;
diff --git a/framework/qa/complex/dispatches/Interceptor.java b/framework/qa/complex/dispatches/Interceptor.java
index fc5b57b1215e..366fe3528134 100755
--- a/framework/qa/complex/dispatches/Interceptor.java
+++ b/framework/qa/complex/dispatches/Interceptor.java
@@ -45,9 +45,6 @@ import com.sun.star.frame.XStatusListener;
 // helper
 import com.sun.star.util.URL;
 
-// others
-//import java.lang.*;
-
 // __________ Implementation __________
 
 /**
diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java
index 178f9c0af987..7854ee5988a6 100755
--- a/framework/qa/complex/framework/autosave/AutoSave.java
+++ b/framework/qa/complex/framework/autosave/AutoSave.java
@@ -316,16 +316,6 @@ public class AutoSave
 
             m_aLog.log(Protocol.TYPE_OK, "saveDoc('"+sURL+"') = OK.");
         }
-/*
-        catch(com.sun.star.io.IOException exIO)
-        {
-            m_aLog.log(Protocol.TYPE_WARNING     , "got IOException on calling doc.store()."                                                            );
-            m_aLog.log(Protocol.TYPE_WARNING_INFO, "Please check the reason for that more in detail."                                                   );
-            m_aLog.log(Protocol.TYPE_WARNING_INFO, "A message like \"Concurrent save requests are not allowed.\" was intended and doesnt show an error!");
-            m_aLog.log(Protocol.TYPE_WARNING_INFO, "Message of the original exception:"                                                                 );
-            m_aLog.log(Protocol.TYPE_WARNING_INFO, exIO.getMessage());
-        }
-*/
         catch(Throwable ex)
         {
             m_aLog.log(ex);
diff --git a/framework/qa/complex/framework/recovery/RecoveryTest.java b/framework/qa/complex/framework/recovery/RecoveryTest.java
index 5ea73f6a41d3..d2e3f046848f 100755
--- a/framework/qa/complex/framework/recovery/RecoveryTest.java
+++ b/framework/qa/complex/framework/recovery/RecoveryTest.java
@@ -160,10 +160,7 @@ public class RecoveryTest extends ComplexTestCase {
         restoreBackupRecoveryData();
         startOffice();
         int expectedDocumentCount = 3;
-//        handleRecoveryDialog_QuickExit(expectedDocumentCount);
         handleRecoveryDialog_QuickExitAndSave(expectedDocumentCount);
-        //handleCrashReporterDialog(true, true);
-        //checkDocumentCount(expectedDocumentCount);
     }
 
     public void before() throws Exception {
@@ -194,7 +191,6 @@ public class RecoveryTest extends ComplexTestCase {
         // make window ranges
         makeWindowPositionRage();
 
-        //makeRecoveryData();
     }
 
     private void makeRecoveryData(){
@@ -482,10 +478,8 @@ public class RecoveryTest extends ComplexTestCase {
 
                 rt.pause();
 
-                //XAccessibleContext oButton = oUITools.getButton("Start Recovery >");
                 int counter = 0;
                 int maximum = param.getInt(PropertyName.THREAD_TIME_OUT) / param.getInt(PropertyName.SHORT_WAIT);
-                //boolean enabeld = oButton.getAccessibleStateSet().contains(com.sun.star.accessibility.AccessibleStateType.ENABLED);
 
                 XAccessibleContext oButton = null;
                 while ((oButton == null) && (counter < maximum)){
@@ -632,23 +626,9 @@ public class RecoveryTest extends ComplexTestCase {
 
         // create some documents with content
         makeWriterDoc("WriterDoc1", true);
-//        makeCalcDoc("CalcDoc1", true);
-//        makeDrawDoc("DrawDoc1", true);
-//        makeImpressDoc("ImpressDoc1", true);
-//        makeMathDoc("MathDoc1", true);
-
-        // create some documents without content
-//        makeMathDoc("_blank_math", false);
-//        makeDrawDoc("_blank_draw", false);
-//        makeCalcDoc("_blank_calc", false);
-//        makeWriterDoc("_blank_writer", false);
-//        makeImpressDoc("_blank_impress", false);
-
-//        makeMathDoc("MathDocEmpty", false);
-//        makeDrawDoc("DrawDocEmpty", false);
-//        makeCalcDoc("CalcDocEmpty", false);
+
+
         makeWriterDoc("WriterDocEmpty", false);
-//        makeImpressDoc("ImpressDocEmpty", false);
 
         log.println("Test object successfully created.");
 
diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java
index 7db880958ab5..9aff703ee96f 100755
--- a/framework/qa/complex/imageManager/CheckImageManager.java
+++ b/framework/qa/complex/imageManager/CheckImageManager.java
@@ -42,9 +42,6 @@ public class CheckImageManager  {
         param.put("ServiceFactory", xMSF); // some qadevOOo functions need the ServiceFactory
     }
 
-//    public String[] getTestMethodNames() {
-//        return new String[]{"checkImageManagerFromModule"};//, "checkImageManager"};
-//    }
 
     @Test public void checkImageManagerFromModule()
     {
@@ -163,31 +160,6 @@ public class CheckImageManager  {
         public void fireEvent() {
             // remove for real action:
             triggered = !triggered;
-/*            try {
-                XIndexAccess xMenuBarSettings = xUIManager.getSettings(
-                                        "private:resource/menubar/menubar", true);
-
-            }
-            catch(com.sun.star.container.NoSuchElementException e) {
-                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
-                e.printStackTrace((java.io.PrintWriter)log);
-            }
-            catch(com.sun.star.lang.IllegalArgumentException e) {
-                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
-                e.printStackTrace((java.io.PrintWriter)log);
-            }
-            catch(com.sun.star.lang.IllegalAccessException e) {
-                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
-                e.printStackTrace((java.io.PrintWriter)log);
-            }
-            catch(com.sun.star.lang.IndexOutOfBoundsException e) {
-                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
-                e.printStackTrace((java.io.PrintWriter)log);
-            }
-            catch(com.sun.star.lang.WrappedTargetException e) {
-                System.out.println("_XUIConfiguration.XUIConfigurationListenerImpl: Exception.");
-                e.printStackTrace((java.io.PrintWriter)log);
-            } */
         }
 
         public void reset() {
diff --git a/framework/qa/complex/imageManager/_XComponent.java b/framework/qa/complex/imageManager/_XComponent.java
index 9affbb9499b5..4188ac53bcd3 100755
--- a/framework/qa/complex/imageManager/_XComponent.java
+++ b/framework/qa/complex/imageManager/_XComponent.java
@@ -179,7 +179,6 @@ public class _XComponent {
     * Forces object recreation.
     */
     protected void after() {
-//        disposeEnvironment();
     }
 
 } // finished class _XComponent
diff --git a/framework/qa/complex/imageManager/_XInitialization.java b/framework/qa/complex/imageManager/_XInitialization.java
index 18d7af99bc52..3bd73a91219f 100755
--- a/framework/qa/complex/imageManager/_XInitialization.java
+++ b/framework/qa/complex/imageManager/_XInitialization.java
@@ -86,7 +86,6 @@ public class _XInitialization {
     * Disposes object environment.
     */
     public void after() {
-//        disposeEnvironment() ;
     }
 
 } // finished class _XInitialization
diff --git a/framework/qa/complex/imageManager/_XUIConfiguration.java b/framework/qa/complex/imageManager/_XUIConfiguration.java
index ec9d5f3fc634..3e4d5b4b3b5c 100755
--- a/framework/qa/complex/imageManager/_XUIConfiguration.java
+++ b/framework/qa/complex/imageManager/_XUIConfiguration.java
@@ -77,6 +77,5 @@ public class _XUIConfiguration {
      * Dispose because the UIConfigurationManager has to be recreated
      */
     public void after() {
-//        disposeEnvironment();
     }
 }
diff --git a/framework/qa/complex/loadAllDocuments/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
index 92d8f3c34543..f882ac73b53e 100755
--- a/framework/qa/complex/loadAllDocuments/InteractionHandler.java
+++ b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
@@ -38,8 +38,6 @@ import com.sun.star.task.XInteractionRetry;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.AnyConverter;
 
-//import java.lang.*;
-
 
 /**
  * Implemets a simple interaction handler,
@@ -78,7 +76,6 @@ public class InteractionHandler implements XInteractionHandler
     public InteractionHandler()
     {
         m_aRequest  = null     ;
-        //m_aProtocol = aProtocol;
         m_nTry      = 0        ;
         m_bWasUsed = false;
     }
diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
index c28993010ed8..aaf1e8e040dd 100755
--- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java
+++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
@@ -41,9 +41,6 @@ import com.sun.star.task.XStatusIndicator;
 // helper
 import com.sun.star.uno.UnoRuntime;
 
-// others
-//import java.lang.*;
-
 // __________ Implementation __________
 
 /**
@@ -79,7 +76,6 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     private int             m_nRange    ;
     private int             m_nValue    ;
     private int             m_nOut      ;
-//    private Protocol        m_aProtocol ;
     private boolean         m_bWasUsed  ;
 
     // ____________________
@@ -94,9 +90,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
         m_nRange    = 100           ;
         m_nValue    = 0             ;
         m_nOut      = nOut          ;
-        //m_aProtocol = aProtocol     ;
         m_bWasUsed  = false;
-//        aProtocol.resetUsingState();
     }
 
     // ____________________
@@ -114,10 +108,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     {
         synchronized(this)
         {
-            //m_aProtocol.log("start("+sText+","+nRange+")\n");
             m_bWasUsed = true;
-//            m_aProtocol.itWasUsed();
-
             m_sText  = sText ;
             m_nRange = nRange;
             m_nValue = 0     ;
@@ -134,10 +125,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     {
         synchronized(this)
         {
-            //m_aProtocol.log("end()\n");
             m_bWasUsed = true;
-//            m_aProtocol.itWasUsed();
-
             m_sText  = new String();
             m_nRange = 100;
             m_nValue = 0;
@@ -157,10 +145,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     {
         synchronized(this)
         {
-            //m_aProtocol.log("setText("+sText+")\n");
             m_bWasUsed = true;
-//            m_aProtocol.itWasUsed();
-
             m_sText = sText;
         }
         impl_show();
@@ -179,9 +164,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     {
         synchronized(this)
         {
-            //m_aProtocol.log("setValue("+nValue+")\n");
             m_bWasUsed = true;
-//            m_aProtocol.itWasUsed();
 
             if (nValue<=m_nRange)
                 m_nValue = nValue;
@@ -198,10 +181,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     {
         synchronized(this)
         {
-            //m_aProtocol.log("reset()\n");
             m_bWasUsed = true;
-//            m_aProtocol.itWasUsed();
-
             m_sText  = new String();
             m_nValue = 0;
         }
diff --git a/framework/qa/complex/loadAllDocuments/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/StreamSimulator.java
index 7b59c25d0a79..0afbb9a9279b 100755
--- a/framework/qa/complex/loadAllDocuments/StreamSimulator.java
+++ b/framework/qa/complex/loadAllDocuments/StreamSimulator.java
@@ -385,8 +385,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream    ,
         else
         if (m_xOutStream != null)
             m_bOutWasUsed = true;
-//        else
-            //m_aProtocol.log("\tno stream open!\n");
 
         if (m_xSeek == null)
         {
@@ -416,8 +414,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream    ,
         else
         if (m_xOutStream != null)
             m_bOutWasUsed = true;
-//        else
-            //m_aProtocol.log("\tno stream open!\n");
 
         if (m_xSeek == null)
         {
@@ -449,8 +445,6 @@ public class StreamSimulator implements com.sun.star.io.XInputStream    ,
         else
         if (m_xOutStream != null)
             m_bOutWasUsed = true;
-//        else
-            //m_aProtocol.log("\tno stream open!\n");
 
         if (m_xSeek == null)
         {
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java
index 36abfd55bbde..e5df2c5a0e03 100755
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.java
@@ -126,7 +126,6 @@ public class PathSettingsTest
         try
         {
             xMSF = getMSF();
-//            aPathSettings = xMSF.createInstance("com.sun.star.util.PathSettings");
             aPathSettings = xMSF.createInstance("com.sun.star.comp.framework.PathSettings");
             assertNotNull("Can't instantiate com.sun.star.util.PathSettings.", aPathSettings);
 //            System.out.println("Implementation: " + util.utils.getImplName(aPathSettings));