Remove visual noise from framework

Conflicts:
framework/inc/dispatch/oxt_handler.hxx
framework/inc/services/layoutmanager.hxx
framework/inc/tabwin/tabwindow.hxx
framework/source/dispatch/menudispatcher.cxx
framework/source/helper/dockingareadefaultacceptor.cxx
framework/source/helper/ocomponentaccess.cxx
framework/source/helper/ocomponentenumeration.cxx
framework/source/helper/oframes.cxx
framework/source/layoutmanager/toolbarlayoutmanager.hxx
framework/source/recording/dispatchrecorder.cxx
framework/source/services/desktop.cxx
framework/source/services/frame.cxx
framework/source/services/urltransformer.cxx

Change-Id: Ibb04e3f6f0796e7f2be16dcce38542f8b90708d4
Reviewed-on: https://gerrit.libreoffice.org/8265
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

18 files changed, 174 insertions, 174 deletions

diff --git a/framework/qa/complex/ModuleManager/CheckXModuleManager.java b/framework/qa/complex/ModuleManager/CheckXModuleManager.java
index d018cac983b7..ef43d156ee73 100644
--- a/framework/qa/complex/ModuleManager/CheckXModuleManager.java
+++ b/framework/qa/complex/ModuleManager/CheckXModuleManager.java
@@ -36,17 +36,17 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
 import static org.junit.Assert.*;
-// ------------------------------------------
 
-//-----------------------------------------------
+
+
 /** @short  todo document me
  */
 public class CheckXModuleManager
 {
-    //-------------------------------------------
+
     // some const
 
-    //-------------------------------------------
+
     // member
 
     /** points to the global uno service manager. */
@@ -58,10 +58,10 @@ public class CheckXModuleManager
     /** a special frame used to load documents there. */
     private XComponentLoader m_xLoader = null;
 
-    //-------------------------------------------
+
     // test environment
 
-    //-------------------------------------------
+
     /** @short  A function to tell the framework,
                 which test functions are available.
 
@@ -79,7 +79,7 @@ public class CheckXModuleManager
 //        };
 //    }
 
-    //-------------------------------------------
+
     /** @short  Create the environment for following tests.
 
         @descr  Use either a component loader from desktop or
@@ -100,7 +100,7 @@ public class CheckXModuleManager
         m_xLoader = UnoRuntime.queryInterface(XComponentLoader.class, xDesktop.findFrame("_blank", 0));
     }
 
-    //-------------------------------------------
+
     /** @short  close the environment.
      */
     @After public void after()
@@ -114,7 +114,7 @@ public class CheckXModuleManager
         m_xSmgr   = null;
     }
 
-    //-------------------------------------------
+
     /** @todo document me
      */
     @Test public void checkModuleIdentification()
@@ -132,7 +132,7 @@ public class CheckXModuleManager
         // impl_identifyModulesBasedOnDocs("com.sun.star.chart.ChartDocument"              );
     }
 
-    //-------------------------------------------
+
     /** @todo document me
      */
     @Test public void checkModuleConfigurationReadable()
@@ -140,7 +140,7 @@ public class CheckXModuleManager
     {
     }
 
-    //-------------------------------------------
+
     /** @todo document me
      */
     @Test public void checkModuleConfigurationWriteable()
@@ -169,7 +169,7 @@ public class CheckXModuleManager
         impl_checkReadOnlyPropsOfModule("com.sun.star.frame.StartModule"    );
     }
 
-    //-------------------------------------------
+
     /** @todo document me
      */
     @Test public void checkModuleConfigurationQueries()
@@ -186,7 +186,7 @@ public class CheckXModuleManager
         impl_searchModulesByDocumentService("com.sun.star.chart.ChartDocument"              );
     }
 
-    //-------------------------------------------
+
     /** @todo document me
      */
     private void impl_searchModulesByDocumentService(String sDocumentService)
@@ -234,7 +234,7 @@ public class CheckXModuleManager
         }
     }
 
-    //-------------------------------------------
+
     /** @todo document me
      */
     private void impl_identifyModulesBasedOnDocs(String sModule)
@@ -284,7 +284,7 @@ public class CheckXModuleManager
         }
     }
 
-    //-------------------------------------------
+
     /** @todo document me
      */
     private void impl_checkReadOnlyPropsOfModule(String sModule)
@@ -298,7 +298,7 @@ public class CheckXModuleManager
         impl_checkReadOnlyPropOfModule(xWrite, sModule, "ooSetupFactoryEmptyDocumentURL"    , "test");
     }
 
-    //-------------------------------------------
+
     /** @todo document me
      */
     private void impl_checkReadOnlyPropOfModule(XNameReplace xMM        ,
diff --git a/framework/qa/complex/XUserInputInterception/EventTest.java b/framework/qa/complex/XUserInputInterception/EventTest.java
index 03ed3520bc8c..fe5be7cb01ef 100644
--- a/framework/qa/complex/XUserInputInterception/EventTest.java
+++ b/framework/qa/complex/XUserInputInterception/EventTest.java
@@ -50,8 +50,8 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
 import static org.junit.Assert.*;
-// ------------------------------------------
-//-----------------------------------------------
+
+
 /**
  * This <CODE>ComplexTest</CODE> checks the interface
  * <CODE>XUserInputInterception</CODE>. Therefore it creates a document,
@@ -62,10 +62,10 @@ import static org.junit.Assert.*;
  * @descr checks is a simple way the interface XUserInputInteraction
  */
 public class EventTest {
-    //-------------------------------------------
+
     // some const
 
-    //-------------------------------------------
+
     // member
 
     /** indicates if the mousePressed event was called*/
@@ -87,10 +87,10 @@ public class EventTest {
      */
     final int m_threadWait = 3000;
 
-    //-------------------------------------------
+
     // test environment
 
-    //-------------------------------------------
+
     /**
      * The test methods are:
      * <ul>
@@ -117,7 +117,7 @@ public class EventTest {
 //        };
 //    }
 
-    //-------------------------------------------
+
     /**
      * creates the mebmer <CODE>m_xMSF</CODE> and <CODE>m_SOF</CODE>
      * @short Create the environment for following tests.
@@ -135,7 +135,7 @@ public class EventTest {
         }
     }
 
-    //-------------------------------------------
+
     /**
      * closes the document
      * @short close the document.
diff --git a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
index c5cc63253f25..9d2a55a59add 100644
--- a/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
+++ b/framework/qa/complex/accelerators/AcceleratorsConfigurationTest.java
@@ -48,8 +48,8 @@ import org.junit.Test;
 import org.openoffice.test.FileHelper;
 import org.openoffice.test.OfficeConnection;
 import static org.junit.Assert.*;
-// ------------------------------------------
-//-----------------------------------------------
+
+
 
 /** @short todo document me
  */
@@ -66,9 +66,9 @@ public class AcceleratorsConfigurationTest
     private XNameAccess m_xPrimaryKeys = null;
     private XNameAccess m_xSecondaryKeys = null;
 
-    //-------------------------------------------
+
     // test environment
-    //-----------------------------------------------
+
     /** @short todo document me
      */
 //  public String[] getTestMethodNames()
@@ -80,7 +80,7 @@ public class AcceleratorsConfigurationTest
 //                "checkDocumentAccelCfg"
 //          };
 //  }
-    //-----------------------------------------------
+
     /** @short Create the environment for following tests.
      */
     @Before
@@ -104,7 +104,7 @@ public class AcceleratorsConfigurationTest
         }
     }
 
-    //-------------------------------------------
+
     /** @short  close the environment.
      */
     @After
@@ -117,7 +117,7 @@ public class AcceleratorsConfigurationTest
         m_xSmgr = null;
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     @Test
@@ -159,7 +159,7 @@ public class AcceleratorsConfigurationTest
         impl_checkGetPreferredKeyEventsForCommandList(m_xGlobalAccelCfg, xPrimaryAccess, sCommandList);
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     @Test
@@ -198,7 +198,7 @@ public class AcceleratorsConfigurationTest
             XNameAccess xPrimaryAccess = UnoRuntime.queryInterface(XNameAccess.class, xPrimaryModules.getByName(sModules[i]));
             XNameAccess xSecondaryAccess = UnoRuntime.queryInterface(XNameAccess.class, xSecondaryModules.getByName(sModules[i]));
 
-            //--------------------------------------------
+
             if (sModules[i].equals("com.sun.star.presentation.PresentationDocument"))
             {
                 sKeys = new String[]
@@ -229,7 +229,7 @@ public class AcceleratorsConfigurationTest
             }
             impl_checkGetKeyCommands(m_xModuleAccelCfg, xPrimaryAccess, sKeys);
 
-            //--------------------------------------------
+
             String[] sCommands;
             if (sModules[i].equals("com.sun.star.presentation.PresentationDocument"))
             {
@@ -277,7 +277,7 @@ public class AcceleratorsConfigurationTest
             }
             impl_checkSetKeyCommands(m_xModuleAccelCfg, xPrimaryAccess, xSecondaryAccess, sKeys, sCommands);
 
-            //--------------------------------------------
+
             if (sModules[i].equals("com.sun.star.presentation.PresentationDocument"))
             {
                 sKeys = new String[]
@@ -308,7 +308,7 @@ public class AcceleratorsConfigurationTest
             }
             impl_checkRemoveKeyCommands(m_xModuleAccelCfg, xPrimaryAccess, xSecondaryAccess, sKeys);
 
-            //--------------------------------------------
+
             String[] sCommandList;
             if (sModules[i].equals("com.sun.star.presentation.PresentationDocument"))
             {
@@ -342,7 +342,7 @@ public class AcceleratorsConfigurationTest
         }
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     @Test
@@ -362,7 +362,7 @@ public class AcceleratorsConfigurationTest
         LoadDocumentAcceleratorConfiguration(sDocCfgName);
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     private void impl_checkGetKeyCommands(XAcceleratorConfiguration xAccelCfg, XNameAccess xAccess, String[] sKeys)
@@ -404,7 +404,7 @@ public class AcceleratorsConfigurationTest
         }
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     private void impl_checkSetKeyCommands(XAcceleratorConfiguration xAccelCfg, XNameAccess xPrimaryAccess, XNameAccess xSecondaryAccess, String[] sKeys, String[] sCommands)
@@ -476,7 +476,7 @@ public class AcceleratorsConfigurationTest
         }
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     private void impl_checkRemoveKeyCommands(XAcceleratorConfiguration xAccelCfg, XNameAccess xPrimaryAccess, XNameAccess xSecondaryAccess, String[] sKeys)
@@ -519,7 +519,7 @@ public class AcceleratorsConfigurationTest
         }
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     private void impl_checkGetPreferredKeyEventsForCommandList(XAcceleratorConfiguration xAccelCfg, XNameAccess xPrimaryAccess, String[] sCommandList)
@@ -549,7 +549,7 @@ public class AcceleratorsConfigurationTest
         }
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     private String getCommandFromConfiguration(XNameAccess xAccess, String sKey)
@@ -572,7 +572,7 @@ public class AcceleratorsConfigurationTest
         return sCommand;
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     private void LoadDocumentAcceleratorConfiguration(String sDocCfgName)
@@ -608,7 +608,7 @@ public class AcceleratorsConfigurationTest
         }
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     private void SaveDocumentAcceleratorConfiguration(String sDocCfgName)
@@ -644,7 +644,7 @@ public class AcceleratorsConfigurationTest
         }
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     private com.sun.star.awt.KeyEvent convertShortcut2AWTKey(String sShortcut)
@@ -674,7 +674,7 @@ public class AcceleratorsConfigurationTest
         return aKeyEvent;
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     private String convertAWTKey2Shortcut(com.sun.star.awt.KeyEvent aKeyEvent)
@@ -701,7 +701,7 @@ public class AcceleratorsConfigurationTest
         return sShortcut;
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     private String getOfficeLocale()
@@ -723,7 +723,7 @@ public class AcceleratorsConfigurationTest
         return sLocale;
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     private void setOfficeLocale(String sLocale)
@@ -743,7 +743,7 @@ public class AcceleratorsConfigurationTest
         }
     }
 
-    //-------------------------------------------
+
     /** @todo document me.
      */
     private XNameAccess openConfig(XMultiServiceFactory xSMGR,
diff --git a/framework/qa/complex/broken_document/LoadDocument.java b/framework/qa/complex/broken_document/LoadDocument.java
index b599f0450145..b1ef17e25008 100644
--- a/framework/qa/complex/broken_document/LoadDocument.java
+++ b/framework/qa/complex/broken_document/LoadDocument.java
@@ -30,7 +30,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
 import static org.junit.Assert.*;
-// ------------------------------------------
+
 
 /**
  * Check, if message boxes appear when the Office is in "headless" mode. Tests
diff --git a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
index 4929eecc1c3f..1cc39e315f2f 100644
--- a/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
+++ b/framework/qa/complex/contextMenuInterceptor/CheckContextMenuInterceptor.java
@@ -58,7 +58,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
 import static org.junit.Assert.*;
-// ------------------------------------------
+
 
 /**
  *
diff --git a/framework/qa/complex/desktop/DesktopTerminate.java b/framework/qa/complex/desktop/DesktopTerminate.java
index 692cdbb16af8..f716e40bc6fb 100644
--- a/framework/qa/complex/desktop/DesktopTerminate.java
+++ b/framework/qa/complex/desktop/DesktopTerminate.java
@@ -26,7 +26,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
 import static org.junit.Assert.*;
-// ------------------------------------------
+
 
 /**
  * Parameters:
diff --git a/framework/qa/complex/dispatches/Interceptor.java b/framework/qa/complex/dispatches/Interceptor.java
index ee81d3d97d43..c17adab40fe1 100644
--- a/framework/qa/complex/dispatches/Interceptor.java
+++ b/framework/qa/complex/dispatches/Interceptor.java
@@ -46,7 +46,7 @@ public class Interceptor implements XDispatchProvider,
                                     XDispatchProviderInterceptor,
                                     XInterceptorInfo
 {
-    // ____________________
+
 
     /** contains the list of interception URL schema's (wildcards are allowed there!)
         supported by this interceptor. It can be set from outside.
@@ -56,7 +56,7 @@ public class Interceptor implements XDispatchProvider,
      */
     private String[] m_lURLs4InterceptionInfo = null;
 
-    // ____________________
+
 
     /** These URL's will be blocked by this interceptor.
         Can be set from outside. Every queryDispatch() for these
@@ -66,7 +66,7 @@ public class Interceptor implements XDispatchProvider,
      */
     private String[] m_lURLs4Blocking = null;
 
-    // ____________________
+
 
     /** Every dispatch interceptor knows it's master and slave interceptor
         of the dispatch chain. These values must be stupid handled .-)
@@ -78,7 +78,7 @@ public class Interceptor implements XDispatchProvider,
     private XDispatchProvider m_xSlave  = null;
     private XDispatchProvider m_xMaster = null;
 
-    // ____________________
+
 
     /** counts calls of setSlave...().
         So the outside API test can use this value to know if this interceptor
@@ -86,7 +86,7 @@ public class Interceptor implements XDispatchProvider,
      */
     private int m_nRegistrationCount = 0;
 
-    // ____________________
+
 
     /** indicates if this interceptor object is currently part of the interceptor
         chain of OOo. Only true if a valid slave or master dispatch is set on this
@@ -95,7 +95,7 @@ public class Interceptor implements XDispatchProvider,
     private boolean m_bIsRegistered = false;
 
 
-    // ____________________
+
 
     /** ctor
      *  It's initialize an object of this class with default values.
@@ -104,7 +104,7 @@ public class Interceptor implements XDispatchProvider,
     {
     }
 
-    // ____________________
+
 
     /** XInterceptorInfo */
     public synchronized String[] getInterceptedURLs()
@@ -112,7 +112,7 @@ public class Interceptor implements XDispatchProvider,
         return impl_getURLs4InterceptionInfo();
     }
 
-    // ____________________
+
 
     /** XDispatchProviderInterceptor */
     public synchronized XDispatchProvider getSlaveDispatchProvider()
@@ -121,7 +121,7 @@ public class Interceptor implements XDispatchProvider,
         return m_xSlave;
     }
 
-    // ____________________
+
 
     /** XDispatchProviderInterceptor */
     public synchronized XDispatchProvider getMasterDispatchProvider()
@@ -130,7 +130,7 @@ public class Interceptor implements XDispatchProvider,
         return m_xMaster;
     }
 
-    // ____________________
+
 
     /** XDispatchProviderInterceptor */
     public synchronized void setSlaveDispatchProvider(XDispatchProvider xSlave)
@@ -150,7 +150,7 @@ public class Interceptor implements XDispatchProvider,
         m_xSlave = xSlave;
     }
 
-    // ____________________
+
 
     /** XDispatchProviderInterceptor */
     public synchronized void setMasterDispatchProvider(XDispatchProvider xMaster)
@@ -159,7 +159,7 @@ public class Interceptor implements XDispatchProvider,
         m_xMaster = xMaster;
     }
 
-    // ____________________
+
 
     /** XDispatchProvider
      */
@@ -185,7 +185,7 @@ public class Interceptor implements XDispatchProvider,
         return this;
     }
 
-    // ____________________
+
 
     /** XDispatchProvider
      */
@@ -205,7 +205,7 @@ public class Interceptor implements XDispatchProvider,
         return lResults;
     }
 
-    // ____________________
+
 
     /** XDispatch
      */
@@ -215,7 +215,7 @@ public class Interceptor implements XDispatchProvider,
         System.out.println("Interceptor.dispatch('"+aURL.Complete+"') called");
     }
 
-    // ____________________
+
 
     /** XDispatch
      */
@@ -225,7 +225,7 @@ public class Interceptor implements XDispatchProvider,
         System.out.println("Interceptor.addStatusListener(..., '"+aURL.Complete+"') called");
     }
 
-    // ____________________
+
 
     /** XDispatch
      */
@@ -235,21 +235,21 @@ public class Interceptor implements XDispatchProvider,
         System.out.println("Interceptor.removeStatusListener(..., '"+aURL.Complete+"') called");
     }
 
-    // ____________________
+
 
     public synchronized int getRegistrationCount()
     {
         return m_nRegistrationCount;
     }
 
-    // ____________________
+
 
     public synchronized boolean isRegistered()
     {
         return m_bIsRegistered;
     }
 
-    // ____________________
+
 
     /** set a new list of URL's, which should be used on registration time
         (that's why it's necessary to call this impl-method before the interceptor
@@ -260,7 +260,7 @@ public class Interceptor implements XDispatchProvider,
         m_lURLs4InterceptionInfo = lURLs;
     }
 
-    // ____________________
+
 
     /** set a new list of URL's, which should be blocked by this interceptor.
         (that's why it's necessary to call this impl-method before the interceptor
@@ -271,7 +271,7 @@ public class Interceptor implements XDispatchProvider,
         m_lURLs4Blocking = lURLs;
     }
 
-    // ____________________
+
 
     /** must be used internal to access the member m_lURLs4InterceptionInfo
         - threadsafe
@@ -288,7 +288,7 @@ public class Interceptor implements XDispatchProvider,
         return m_lURLs4InterceptionInfo;
     }
 
-    // ____________________
+
 
     /** must be used internal to access the member m_lURLs4Blocking
         - threadsafe
@@ -305,7 +305,7 @@ public class Interceptor implements XDispatchProvider,
         return m_lURLs4Blocking;
     }
 
-    // ____________________
+
     private boolean impl_isBlockedURL(String sURL)
     {
         String[] lBlockedURLs = impl_getURLs4Blocking();
@@ -323,7 +323,7 @@ public class Interceptor implements XDispatchProvider,
         return false;
     }
 
-    // ____________________
+
 
     private boolean impl_match(String sVal1, String sVal2)
     {
diff --git a/framework/qa/complex/dispatches/checkdispatchapi.java b/framework/qa/complex/dispatches/checkdispatchapi.java
index 11671ea4e259..e4c98c8946ff 100644
--- a/framework/qa/complex/dispatches/checkdispatchapi.java
+++ b/framework/qa/complex/dispatches/checkdispatchapi.java
@@ -43,9 +43,9 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
 import static org.junit.Assert.*;
-// ------------------------------------------
 
-//-----------------------------------------------
+
+
 /** @short  Check the interface XDispatchInformationProvider
 
 @descr  Because there exists more then one implementation of a dispatch
@@ -53,10 +53,10 @@ object, we have to test all these implementations ...
  */
 public class checkdispatchapi
 {
-    //-------------------------------------------
+
     // some const
 
-    //-------------------------------------------
+
     // member
     /** points to the global uno service manager. */
     private XMultiServiceFactory m_xMSF = null;
@@ -66,9 +66,9 @@ public class checkdispatchapi
     /** provides XDispatchInformationProvider interface. */
     private XFrame m_xFrame = null;
 
-    //-------------------------------------------
+
     // test environment
-    //-------------------------------------------
+
     /** @short  A function to tell the framework,
     which test functions are available.
 
@@ -98,7 +98,7 @@ public class checkdispatchapi
 //                };
 //    }
 
-    //-------------------------------------------
+
     /** @short  Create the environment for following tests.
 
     @descr  create an empty test frame, where we can load
@@ -124,7 +124,7 @@ public class checkdispatchapi
         }
     }
 
-    //-------------------------------------------
+
     /** @short  close the environment.
      */
     @After public void after()
@@ -134,84 +134,84 @@ public class checkdispatchapi
         m_xFrame = null;
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfWriter()
     {
         impl_checkDispatchInfoOfXXX("private:factory/swriter");
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfCalc()
     {
         impl_checkDispatchInfoOfXXX("private:factory/scalc");
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfDraw()
     {
         impl_checkDispatchInfoOfXXX("private:factory/sdraw");
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfImpress()
     {
         impl_checkDispatchInfoOfXXX("private:factory/simpress");
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfChart()
     {
         impl_checkDispatchInfoOfXXX("private:factory/schart");
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfMath()
     {
         impl_checkDispatchInfoOfXXX("private:factory/smath");
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfDataBase()
     {
         impl_checkDispatchInfoOfXXX("private:factory/sdatabase");
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfBibliography()
     {
         impl_checkDispatchInfoOfXXX(".component:Bibliography/View1");
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfQueryDesign()
     {
         callDatabaseDispatch(".component:DB/QueryDesign");
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfTableDesign()
     {
         callDatabaseDispatch(".component:DB/TableDesign");
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfFormGridView()
     {
         impl_checkDispatchInfoOfXXX(".component:DB/FormGridView");
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfDataSourceBrowser()
     {
         impl_checkDispatchInfoOfXXX(".component:DB/DataSourceBrowser");
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfRelationDesign()
     {
         callDatabaseDispatch(".component:DB/RelationDesign");
     }
-    //-------------------------------------------
+
 
     private void callDatabaseDispatch(String url)
     {
@@ -235,21 +235,21 @@ public class checkdispatchapi
         }
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfBasic()
     {
         Object aComponent = impl_createUNOComponent("com.sun.star.script.BasicIDE");
         impl_checkDispatchInfo(aComponent);
     }
 
-    //-------------------------------------------
+
     @Test public void checkDispatchInfoOfStartModule()
     {
         Object aComponent = impl_createUNOComponent("com.sun.star.frame.StartModule");
         impl_checkDispatchInfo(aComponent);
     }
 
-    //-------------------------------------------
+
     public void checkInterceptorLifeTime()
     {
         // Note: It's important for the following test, that aInterceptor will be hold alive by the uno reference
@@ -284,7 +284,7 @@ public class checkdispatchapi
         System.out.println("Destruction of interception chain works as designed .-)");
     }
 
-    //-------------------------------------------
+
     public void checkInterception()
     {
         String[] lDisabledURLs = new String[1];
@@ -309,7 +309,7 @@ public class checkdispatchapi
         xInterception.releaseDispatchProviderInterceptor(xInterceptor);
     }
 
-    //-------------------------------------------
+
     private void impl_checkDispatchInfoOfXXX(String sXXX)
     {
         XFrame xFrame = impl_createNewFrame();
@@ -318,7 +318,7 @@ public class checkdispatchapi
         impl_closeFrame(xFrame);
     }
 
-    //-------------------------------------------
+
     /** @short  load an URL into the current test frame.
      */
     private void impl_loadIntoFrame(XFrame xFrame, String sURL, PropertyValue args[])
@@ -345,7 +345,7 @@ public class checkdispatchapi
         }
     }
 
-    //-------------------------------------------
+
     /** @short  create an uno implementation directly.
      */
     private Object impl_createUNOComponent(String sName)
@@ -367,7 +367,7 @@ public class checkdispatchapi
         return aComponent;
     }
 
-    //-------------------------------------------
+
     /** @short  check the interface XDispatchInformationProvider
     at the specified component.
      */
@@ -432,7 +432,7 @@ public class checkdispatchapi
         }
     }
 
-    //-------------------------------------------
+
     private synchronized XFrame impl_createNewFrame()
     {
         XFrame xFrame = null;
@@ -450,7 +450,7 @@ public class checkdispatchapi
         return xFrame;
     }
 
-    //-------------------------------------------
+
     private synchronized void impl_closeFrame(XFrame xFrame)
     {
         XCloseable xClose = UnoRuntime.queryInterface(XCloseable.class, xFrame);
diff --git a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
index d241f70baf04..31e6262291a4 100644
--- a/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
+++ b/framework/qa/complex/disposing/GetServiceWhileDisposingOffice.java
@@ -26,7 +26,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
 import static org.junit.Assert.*;
-// ------------------------------------------
+
 
 /**
  * This test is for bug110698. The Office is closed and is continually connected
diff --git a/framework/qa/complex/framework/autosave/AutoSave.java b/framework/qa/complex/framework/autosave/AutoSave.java
index 4d02849a9992..6cb9e7ace213 100644
--- a/framework/qa/complex/framework/autosave/AutoSave.java
+++ b/framework/qa/complex/framework/autosave/AutoSave.java
@@ -54,14 +54,14 @@ import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
 import util.SOfficeFactory;
 import static org.junit.Assert.*;
-// ------------------------------------------
 
-//-----------------------------------------------
+
+
 /** @short  Check some use cases of the AutoSave feature
  */
 public class AutoSave
 {
-    //-------------------------------------------
+
     class AutoSaveListener implements XStatusListener
     {
         private XDispatch m_xAutoSave;
@@ -150,10 +150,10 @@ public class AutoSave
         }
     }
 
-    //-------------------------------------------
+
     // some const
 
-    //-------------------------------------------
+
     // member
 
     private Protocol m_aLog;
@@ -168,10 +168,10 @@ public class AutoSave
 
     private XURLTransformer m_xURLParser = null;
 
-    //-------------------------------------------
+
     // test environment
 
-    //-------------------------------------------
+
     /** @short  A function to tell the framework,
                 which test functions are available.
 
@@ -186,7 +186,7 @@ public class AutoSave
 //        };
 //    }
 
-    //-------------------------------------------
+
     /** @short  Create the environment for following tests.
 
         @descr  create an empty test frame, where we can load
@@ -226,7 +226,7 @@ public class AutoSave
         }
     }
 
-    //-------------------------------------------
+
     /** @short  close the environment.
      */
     @After public void after()
@@ -234,7 +234,7 @@ public class AutoSave
         // ???
     }
 
-    //-------------------------------------------
+
     // create a calc document with content, which needs some time for saving
     private XInterface createBigCalcDoc()
     {
@@ -272,7 +272,7 @@ public class AutoSave
         return null;
     }
 
-    //-------------------------------------------
+
     private void saveDoc(XInterface xDoc,
                          String     sURL)
     {
@@ -310,7 +310,7 @@ public class AutoSave
         m_aLog.log(Protocol.TYPE_SCOPE_CLOSE, "saveDoc('"+sURL+"') finished.");
     }
 
-    //-------------------------------------------
+
     private void closeDoc(XInterface xDoc)
     {
         m_aLog.log(Protocol.TYPE_SCOPE_OPEN, "closeDoc() started ...");
@@ -382,7 +382,7 @@ public class AutoSave
         }
     }
 
-    //-------------------------------------------
+
     /** @short  check concurrent save requests to the same document
      *          at the same time.
      *
diff --git a/framework/qa/complex/framework/autosave/ConfigHelper.java b/framework/qa/complex/framework/autosave/ConfigHelper.java
index ab11a324478e..38a26a1975b6 100644
--- a/framework/qa/complex/framework/autosave/ConfigHelper.java
+++ b/framework/qa/complex/framework/autosave/ConfigHelper.java
@@ -29,7 +29,7 @@ class ConfigHelper
 {
     private XHierarchicalNameAccess m_xConfig = null;
 
-    //-----------------------------------------------
+
     public ConfigHelper(XComponentContext context,
                         String               sConfigPath ,
                         boolean              bReadOnly   )
@@ -60,7 +60,7 @@ class ConfigHelper
         }
     }
 
-    //-----------------------------------------------
+
     public Object readRelativeKey(String sRelPath,
                                   String sKey    )
         throws com.sun.star.container.NoSuchElementException
@@ -76,7 +76,7 @@ class ConfigHelper
         }
     }
 
-    //-----------------------------------------------
+
     public void writeRelativeKey(String sRelPath,
                                  String sKey    ,
                                  Object aValue  )
@@ -93,7 +93,7 @@ class ConfigHelper
         }
     }
 
-    //-----------------------------------------------
+
     public void flush()
     {
         try
diff --git a/framework/qa/complex/framework/autosave/Protocol.java b/framework/qa/complex/framework/autosave/Protocol.java
index 8c92b091f6fc..9ff87237587d 100644
--- a/framework/qa/complex/framework/autosave/Protocol.java
+++ b/framework/qa/complex/framework/autosave/Protocol.java
@@ -37,7 +37,7 @@ import java.sql.*;
  */
 public class Protocol extends JComponent
 {
-    // ____________________
+
     /**
      * Note: Following values can be combined - they are interpreted as flags.
      *
@@ -83,7 +83,7 @@ public class Protocol extends JComponent
     public  static final int    FILTER_STATISTIC        = TYPE_STATISTIC;
     public  static final int    FILTER_LINK             = TYPE_LINK;
 
-    // ____________________
+
     /**
      */
     private static final int    MARK_DIFF               = 5;
@@ -128,7 +128,7 @@ public class Protocol extends JComponent
     private static final String BGCOLOR_LINK            = BGCOLOR_INFO;
     private static final String FGCOLOR_LINK            = FGCOLOR_INFO;
 
-    // ____________________
+
     /**
      * @member  m_nMode         the mode, in which this protocol object runs
      * @member  m_nFilter       can be used to filter log messages by type
@@ -150,7 +150,7 @@ public class Protocol extends JComponent
     private Timestamp           m_aStartTime;
     private Timestamp           m_aEndTime  ;
 
-    // ____________________
+
     /**
      * special helper class to represent one line of a protocol.
      * Such line can be specified as a special one (ERROR, WARNING ...).
@@ -443,7 +443,7 @@ public class Protocol extends JComponent
         }
     }
 
-    // ____________________
+
     /**
      * ctor
      * It creates a new instance of this class and innitialize it in the right mode.
@@ -471,7 +471,7 @@ public class Protocol extends JComponent
         m_aStartTime = new Timestamp(System.currentTimeMillis());
     }
 
-    // ____________________
+
     /**
      * For some modes it's necessary, that we write some additional
      * information to the log. E.g. for html we must generate close targets.
@@ -491,7 +491,7 @@ public class Protocol extends JComponent
         impl_writeToLogFile(m_sFileName, true, sContent);
     }
 
-    // ____________________
+
     /**
      * log an unspecified message.
      *
@@ -509,7 +509,7 @@ public class Protocol extends JComponent
         log(TYPE_INFO, sMessage);
     }
 
-    // ____________________
+
     /**
      * log an exception.
      *
@@ -531,7 +531,7 @@ public class Protocol extends JComponent
         log(TYPE_SCOPE_CLOSE | TYPE_ERROR_INFO, "");
     }
 
-    // ____________________
+
     /**
      * log different property arrays.
      *
@@ -583,7 +583,7 @@ public class Protocol extends JComponent
         log(TYPE_SCOPE_CLOSE | TYPE_INFO, sValue.toString());
     }
 
-    // ____________________
+
     /**
      * log a message.
      *
@@ -670,7 +670,7 @@ public class Protocol extends JComponent
         }
     }
 
-    // ____________________
+
     public synchronized void defineHyperlink( /*IN*/ String sTarget     ,
                                               /*IN*/ String sDescription)
     {
@@ -687,7 +687,7 @@ public class Protocol extends JComponent
         log(TYPE_LINK, sLog.toString());
     }
 
-    // ____________________
+
     /**
      * log the current statistic values
      * We write it into our protocol buffer and
@@ -723,7 +723,7 @@ public class Protocol extends JComponent
         m_aStartTime = new Timestamp(System.currentTimeMillis());
     }
 
-    // ____________________
+
     /**
      * returns a generic html header for generating html log files
      *
@@ -755,7 +755,7 @@ public class Protocol extends JComponent
         return "\n\n";
     }
 
-    // ____________________
+
     /**
      * helper to log different representations of a property(array)
      *
@@ -799,7 +799,7 @@ public class Protocol extends JComponent
         impl_logAny(sOut, aProp.Value);
     }
 
-    // ____________________
+
     /**
      * it trys to convert the given any into a suitable string notation .-)
     */
@@ -940,7 +940,7 @@ public class Protocol extends JComponent
         }
     }
 
-    // ____________________
+
     /**
      * Writes the given content to the specified log file.
      */
diff --git a/framework/qa/complex/imageManager/CheckImageManager.java b/framework/qa/complex/imageManager/CheckImageManager.java
index 40f194c69e52..e91d9eef49f1 100644
--- a/framework/qa/complex/imageManager/CheckImageManager.java
+++ b/framework/qa/complex/imageManager/CheckImageManager.java
@@ -38,7 +38,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
 import static org.junit.Assert.*;
-// ------------------------------------------
+
 
 /**
  *
diff --git a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
index b6ae2a107e96..f224a4130c45 100644
--- a/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
+++ b/framework/qa/complex/loadAllDocuments/CheckXComponentLoader.java
@@ -48,7 +48,7 @@ import com.sun.star.ucb.XSimpleFileAccess;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.util.XCloseable;
 
-//-----------------------------------------------
+
 /** @short  Check the interface method XComponentLoader.loadComponentFromURL()
 
     @descr  A prerequisite for this test is a server which allows access to files
@@ -68,7 +68,7 @@ import com.sun.star.util.XCloseable;
  */
 public class CheckXComponentLoader
 {
-    //-------------------------------------------
+
     // some const
 
     /** used to classify the result of a loadComponentFromURL() request. */
@@ -89,7 +89,7 @@ public class CheckXComponentLoader
     private static final String PREFIX_PASSWORD_TEMPFILE = ".sxw";
     private static final String DEFAULT_PASSWORD         = "DefaultPasswordForComponentLoaderTest";
 
-    //-------------------------------------------
+
     // member
 
     /** points to the global uno service manager. */
@@ -116,10 +116,10 @@ public class CheckXComponentLoader
     /** files of m_sTestDocPath to test. */
     private static ArrayList<String> m_lTestFiles = null;
 
-    //-------------------------------------------
+
     // test environment
 
-    //-------------------------------------------
+
     /** @short  A function to tell the framework,
                 which test functions are available.
 
@@ -139,7 +139,7 @@ public class CheckXComponentLoader
 //        };
 //    }
 
-    //-------------------------------------------
+
     /** @short  Create the environment for following tests.
 
         @descr  Use either a component loader from desktop or
@@ -227,7 +227,7 @@ public class CheckXComponentLoader
         }
     }
 
-    //-------------------------------------------
+
     /** @short  close the environment.
      */
     @After public void after()
@@ -244,7 +244,7 @@ public class CheckXComponentLoader
         m_xLoader = null;
     }
 
-    //-------------------------------------------
+
     /** @short  Look for files in the given directory for loading.
      */
     @Test public void checkUsingOfMediaDescriptor()
@@ -292,7 +292,7 @@ public class CheckXComponentLoader
         }
     }
 
-    //-------------------------------------------
+
     /** TODO document me and move this method to a more global helper! */
     private String impl_getTempFileName(String sTempPath,
                                         String sSuffix  ,
@@ -319,7 +319,7 @@ public class CheckXComponentLoader
         return null;
     }
 
-    //-------------------------------------------
+
     /** TODO document me and move this method to a more global helper! */
     private void impl_createTempOfficeDocument(XComponentLoader xLoader   ,
                                                String           sSourceURL,
@@ -368,7 +368,7 @@ public class CheckXComponentLoader
         }
     }
 
-    //-------------------------------------------
+
     /** @short  Check the password handling.
 
         @descr  The used password is the one given
diff --git a/framework/qa/complex/loadAllDocuments/InteractionHandler.java b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
index 1101ecd15bc4..ca0ec71bec7a 100644
--- a/framework/qa/complex/loadAllDocuments/InteractionHandler.java
+++ b/framework/qa/complex/loadAllDocuments/InteractionHandler.java
@@ -28,7 +28,7 @@ import com.sun.star.uno.AnyConverter;
  */
 public class InteractionHandler implements XInteractionHandler
 {
-    // ____________________
+
 
     /**
      * @const   RETRY_COUNT it defines the max count of
@@ -36,7 +36,7 @@ public class InteractionHandler implements XInteractionHandler
      */
     private static final int RETRY_COUNT    = 3;
 
-    // ____________________
+
 
     /**
      * @member  m_aRequest      the origianl interaction request
diff --git a/framework/qa/complex/loadAllDocuments/StatusIndicator.java b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
index d92e271516e7..1fe78765f9a8 100644
--- a/framework/qa/complex/loadAllDocuments/StatusIndicator.java
+++ b/framework/qa/complex/loadAllDocuments/StatusIndicator.java
@@ -30,7 +30,7 @@ package complex.loadAllDocuments;
  */
 public class StatusIndicator implements com.sun.star.task.XStatusIndicator
 {
-    // ____________________
+
 
     /**
      * @const SHOWSTATUS_NO         don't show the status - but save information about using of this indicator object
@@ -43,7 +43,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     public static final int SHOWSTATUS_DIALOG   =   4;
     public static final int SHOWSTATUS_LINK     =   8;
 
-    // ____________________
+
 
     /**
      * @member m_nRange     max value for any progress
@@ -51,7 +51,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
     private int             m_nRange    ;
     private boolean         m_bWasUsed  ;
 
-    // ____________________
+
 
     /**
      * ctor
@@ -63,7 +63,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
         m_bWasUsed  = false;
     }
 
-    // ____________________
+
 
     /**
      * It starts the progress and set the initial text and range.
@@ -84,7 +84,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
         impl_show();
     }
 
-    // ____________________
+
 
     /**
      * Finish the progress and reset internal members.
@@ -99,7 +99,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
         impl_show();
     }
 
-    // ____________________
+
 
     /**
      * Set the new description text.
@@ -116,7 +116,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
         impl_show();
     }
 
-    // ____________________
+
 
     /**
      * Set the new progress value.
@@ -134,7 +134,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
         impl_show();
     }
 
-    // ____________________
+
 
     /**
      * Reset text and progress value to her defaults.
@@ -148,7 +148,7 @@ public class StatusIndicator implements com.sun.star.task.XStatusIndicator
         impl_show();
     }
 
-    // ____________________
+
 
     /**
      * Internal helper to show the status.
diff --git a/framework/qa/complex/loadAllDocuments/StreamSimulator.java b/framework/qa/complex/loadAllDocuments/StreamSimulator.java
index 851bfd2cba79..2930915e2715 100644
--- a/framework/qa/complex/loadAllDocuments/StreamSimulator.java
+++ b/framework/qa/complex/loadAllDocuments/StreamSimulator.java
@@ -31,7 +31,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream    ,
                                         com.sun.star.io.XOutputStream   ,
                                         com.sun.star.io.XSeekable
 {
-    //_________________________________
+
     /**
      * @member  m_sFileName     name of the corrsponding file on disk
      * @member  m_xInStream     the internal input stream for reading
@@ -177,7 +177,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream    ,
         return nRead;
     }
 
-    //_________________________________
+
 
     public void skipBytes(int nBytesToSkip)
                                 throws com.sun.star.io.NotConnectedException,
@@ -230,7 +230,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream    ,
         return nAvailable;
     }
 
-    //_________________________________
+
 
     public void closeInput() throws com.sun.star.io.NotConnectedException,
                                     com.sun.star.io.IOException
@@ -287,7 +287,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream    ,
 
     }
 
-    //_________________________________
+
 
     public void flush() throws com.sun.star.io.NotConnectedException        ,
                                com.sun.star.io.BufferSizeExceededException  ,
@@ -314,7 +314,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream    ,
         }
     }
 
-    //_________________________________
+
 
     public void closeOutput() throws com.sun.star.io.NotConnectedException      ,
                                      com.sun.star.io.BufferSizeExceededException,
@@ -401,7 +401,7 @@ public class StreamSimulator implements com.sun.star.io.XInputStream    ,
         return nPos;
     }
 
-    //_________________________________
+
 
     public long getLength() throws com.sun.star.io.IOException
     {
diff --git a/framework/qa/complex/path_settings/PathSettingsTest.java b/framework/qa/complex/path_settings/PathSettingsTest.java
index 599b76d46b12..6df3c8b00936 100644
--- a/framework/qa/complex/path_settings/PathSettingsTest.java
+++ b/framework/qa/complex/path_settings/PathSettingsTest.java
@@ -38,7 +38,7 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.openoffice.test.OfficeConnection;
 import static org.junit.Assert.*;
-// ------------------------------------------
+
 
 public class PathSettingsTest
 {
@@ -652,7 +652,7 @@ public class PathSettingsTest
         return bResult;
     }
 
-    // ____________________
+
     /**
      * This tests the XMultiPropertySet interface implementation.
      */
@@ -868,7 +868,7 @@ public class PathSettingsTest
 //                || ml.vetoableChangeEventFired();
 //    }
 
-    // ____________________
+
     /**
      * Change the given String to a correct path URL.
      * @return The changed path URL.