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>

157 files changed, 1652 insertions, 1725 deletions

diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx
index 4542001f5f3b..c3219698afd3 100644
--- a/framework/inc/classes/actiontriggerpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerpropertyset.hxx
@@ -65,9 +65,9 @@ class ActionTriggerPropertySet :  public ThreadHelpBase                       ,
         virtual FWE_DLLPUBLIC ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     private:
-        //---------------------------------------------------------------------------------------------------------
+
         //  OPropertySetHelper
-        //---------------------------------------------------------------------------------------------------------
+
         virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any&       aConvertedValue,
                                                             com::sun::star::uno::Any&       aOldValue,
                                                             sal_Int32                       nHandle,
@@ -88,9 +88,9 @@ class ActionTriggerPropertySet :  public ThreadHelpBase                       ,
 
         static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  helper
-        //---------------------------------------------------------------------------------------------------------
+
 
         sal_Bool impl_tryToChangeProperty(  const   OUString&              aCurrentValue   ,
                                             const   com::sun::star::uno::Any&   aNewValue       ,
@@ -107,9 +107,9 @@ class ActionTriggerPropertySet :  public ThreadHelpBase                       ,
                                             com::sun::star::uno::Any&           aOldValue       ,
                                             com::sun::star::uno::Any&           aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  members
-        //---------------------------------------------------------------------------------------------------------
+
 
         OUString                                                         m_aCommandURL;
         OUString                                                         m_aHelpURL;
diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
index 025b9b0b8d08..de90232e1702 100644
--- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
+++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx
@@ -64,9 +64,9 @@ class ActionTriggerSeparatorPropertySet :   public ThreadHelpBase
         virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
     private:
-        //---------------------------------------------------------------------------------------------------------
+
         //  OPropertySetHelper
-        //---------------------------------------------------------------------------------------------------------
+
         virtual sal_Bool SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any&       aConvertedValue,
                                                             com::sun::star::uno::Any&       aOldValue,
                                                             sal_Int32                       nHandle,
@@ -87,18 +87,18 @@ class ActionTriggerSeparatorPropertySet :   public ThreadHelpBase
 
         static const com::sun::star::uno::Sequence< com::sun::star::beans::Property > impl_getStaticPropertyDescriptor();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  helper
-        //---------------------------------------------------------------------------------------------------------
+
 
         sal_Bool impl_tryToChangeProperty(  sal_Int16                           aCurrentValue   ,
                                             const   com::sun::star::uno::Any&   aNewValue       ,
                                             com::sun::star::uno::Any&           aOldValue       ,
                                             com::sun::star::uno::Any&           aConvertedValue ) throw( com::sun::star::lang::IllegalArgumentException );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  members
-        //---------------------------------------------------------------------------------------------------------
+
 
         sal_Int16   m_nSeparatorType;
 };
diff --git a/framework/inc/classes/checkediterator.hxx b/framework/inc/classes/checkediterator.hxx
index ceb3d74b430d..f207e651c177 100644
--- a/framework/inc/classes/checkediterator.hxx
+++ b/framework/inc/classes/checkediterator.hxx
@@ -26,7 +26,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          implement a iterator which support 2 end states!
     @descr          For our search methods we need a "walking" iterator object with special functionality!
                     We must check for 3 different states of an iterator - normal position, exact end, after end.
@@ -47,17 +47,17 @@ namespace framework{
 template< class TContainer >
 class CheckedIterator
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         // constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      standard constructor
             @descr      Set default values on members.
                         We set it internal to E_UNKNOWN to detect uninitialized instances of this class.
@@ -77,11 +77,11 @@ class CheckedIterator
         {
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // interface methods
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      initialize instance with valid container
             @descr      Set new container at an instance of this class. The other member will set automaticly!
                         m_pPosition = first element in container
@@ -110,7 +110,7 @@ class CheckedIterator
             }
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      set internal states to E_END
             @descr      Sometimes we need a "walking" check-iterator which is initialized with the END-state!
                         We need it to return one default value if no other ones exist ...
@@ -129,7 +129,7 @@ class CheckedIterator
             m_eEndState  = E_END ;
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      set internal states to E_AFTEREND
             @descr      Sometimes we need a "walking" check-iterator which is initialized with AFTEREND-state!
                         We need it if we don't have a container but must prevent us against further searching!
@@ -148,7 +148,7 @@ class CheckedIterator
             m_eEndState  = E_AFTEREND ;
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      reset this iterator
             @descr      It must be called on an already initialized iterator.
                         Means the member m_pContainer must be valid. Otherwise the reaction
@@ -166,7 +166,7 @@ class CheckedIterator
             m_pContainer = NULL;
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      step to next element in container.
             @descr      If end of container is reached we change our internal "m_eEndState".
                         If end reached for first time; we set it to E_END;
@@ -207,7 +207,7 @@ class CheckedIterator
             return *this;
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      return true if internal iterator was not initialized before
             @descr      These will be true, if use start a new search by using these iterator mechanism!
 
@@ -224,7 +224,7 @@ class CheckedIterator
             return( m_eEndState == E_UNKNOWN );
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      return true if internal iterator reached end of container
             @descr      These will be true if you step to the end of internal container.
 
@@ -245,7 +245,7 @@ class CheckedIterator
                     );
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      return true if you call operator++ again and end already reached
             @descr      These indicate, that end already reached but you call operator++ again and again!
 
@@ -263,7 +263,7 @@ class CheckedIterator
             return( m_eEndState == E_AFTEREND );
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      support readonly access to container entry
             @descr      Use it to get the value of current container item.
 
@@ -285,9 +285,9 @@ class CheckedIterator
             return m_pPosition;
         }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
diff --git a/framework/inc/classes/filtercache.hxx b/framework/inc/classes/filtercache.hxx
index 52a3dcd7b365..797ba1410dc3 100644
--- a/framework/inc/classes/filtercache.hxx
+++ b/framework/inc/classes/filtercache.hxx
@@ -50,7 +50,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          cache for all filter and type information
     @descr          Frameloader - and filterfactory need some information about our current registered filters and types.
                     For better performance its necessary to cache all needed values.
@@ -68,20 +68,20 @@ class FilterCache   :   private ThreadHelpBase
 {
     public:
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
+
 
         FilterCache( sal_Int32 nVersion = DEFAULT_FILTERCACHE_VERSION,
                      sal_Int16 nMode    = DEFAULT_FILTERCACHE_MODE   );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      standard destructor to delete instance
             @descr      This will clear the cache if last owner release it.
 
@@ -97,7 +97,7 @@ class FilterCache   :   private ThreadHelpBase
 
         void flush( DataContainer::ECFGType eType );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      get the current state of the cache
             @descr      Call this methods to get information about the state of the current cache.
 
@@ -117,7 +117,7 @@ class FilterCache   :   private ThreadHelpBase
         sal_Bool hasLoaders         () const;
         sal_Bool hasContentHandlers () const;
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      search routines to find items which match given parameter
             @descr      Mostly we search for a type first and get all information about filter, detector and loader
                         services from the other configuration tables which are registered for this type.
@@ -164,7 +164,7 @@ class FilterCache   :   private ThreadHelpBase
                                                             CheckedStringListIterator&  aStartEntry         ,
                                                             OUString&            sResult             ) const;
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      get all properties of a cache entry by given name
             @descr      If you need additional information about our internal cache values
                         you can use these methods to get a list of all cached config values
@@ -205,7 +205,7 @@ class FilterCache   :   private ThreadHelpBase
         sal_Bool                                            existsLoader                    (   const   OUString&    sName   ) const;
         sal_Bool                                            existsContentHandler            (   const   OUString&    sName   ) const;
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      support special query modes
             @descr      Our owner services need sometimes a special mode to query for subsets of our configuration!
                         They give us a special query string - we return right values.
@@ -223,7 +223,7 @@ class FilterCache   :   private ThreadHelpBase
 
         css::uno::Any queryFilters( const OUString& sQuery ) const;
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      support registration of elements in current configuration
             @descr      Use this methods to add or remove items in our configuration files.
                         We use the globale configuration to do that ... in fat office "share/config/registry/..."!
@@ -313,9 +313,9 @@ class FilterCache   :   private ThreadHelpBase
         sal_Bool validateAndRepairLoader();
         sal_Bool validateAndRepairHandler();
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private variables
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         static sal_Int32        m_nRefCount         ;
diff --git a/framework/inc/classes/filtercachedata.hxx b/framework/inc/classes/filtercachedata.hxx
index 82336b441f98..dc566f73d6bd 100644
--- a/framework/inc/classes/filtercachedata.hxx
+++ b/framework/inc/classes/filtercachedata.hxx
@@ -66,16 +66,16 @@ enum EFilterPackage
     E_ADDITIONAL
 };
 
-//*****************************************************************************************************************
+
 // These struct define a type, which present the type of a file.
 // He is used for easy filter detection without file stream detection!
 // The internal name is the keyname of an item with these structure in our hash map or our configuration set!
-//*****************************************************************************************************************
+
 struct FileType
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     // public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
         inline               FileType   (                               ) { impl_clear();               }
@@ -84,9 +84,9 @@ struct FileType
         inline FileType&    operator=   (   const   FileType&   rCopy   ) { return impl_copy( rCopy );  }
         inline void         free        (                               ) { impl_clear();               }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // private methods
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         inline void impl_clear()
@@ -114,9 +114,9 @@ struct FileType
             return (*this);
         }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // public member
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
         sal_Bool            bPreferred          ;
@@ -129,17 +129,17 @@ struct FileType
         OUStringList        lExtensions         ;
 };
 
-//*****************************************************************************************************************
+
 // These struct describe a filter which is registered for one type.
 // He hold information about services which present the document himself (like a item) and a filter service which
 // filter a file in these document.
 // The internal name is the keyname of an item with these structure in our hash map or our configuration set!
-//*****************************************************************************************************************
+
 struct Filter
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     // public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
         inline           Filter     (                           ) { impl_clear();               }
@@ -148,9 +148,9 @@ struct Filter
         inline Filter&  operator=   (   const   Filter& rCopy   ) { return impl_copy( rCopy );  }
         inline void     free        (                           ) { impl_clear();               }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // private methods
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         inline void impl_clear()
@@ -184,9 +184,9 @@ struct Filter
             return (*this);
         }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // public member
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
         sal_Int32           nOrder              ;
@@ -202,16 +202,16 @@ struct Filter
         OUString     sTemplateName       ;
 };
 
-//*****************************************************************************************************************
+
 // Programmer can register his own services for an content detection of different types.
 // The implementation or service name of these is the keyname of an item with these structure
 // in our hash map or our configuration set!
-//*****************************************************************************************************************
+
 struct Detector
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     // public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
         inline               Detector   (                               ) { impl_clear();               }
@@ -220,9 +220,9 @@ struct Detector
         inline Detector&    operator=   (   const   Detector&   rCopy   ) { return impl_copy( rCopy );  }
         inline void         free        (                               ) { impl_clear();               }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // private methods
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         inline void impl_clear()
@@ -238,25 +238,25 @@ struct Detector
             return (*this);
         }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // public member
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
         OUString     sName       ;
         OUStringList        lTypes      ;
 };
 
-//*****************************************************************************************************************
+
 // Programmer can register his own services for loading documents in a frame.
 // The implementation or service name of these is the keyname of an item with these structure
 // in our hash map or our configuration set!
-//*****************************************************************************************************************
+
 struct Loader
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     // public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
         inline           Loader     (                           ) { impl_clear();               }
@@ -265,9 +265,9 @@ struct Loader
         inline Loader&  operator=   (   const   Loader& rCopy   ) { return impl_copy( rCopy );  }
         inline void     free        (                           ) { impl_clear();               }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // private methods
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         inline void impl_clear()
@@ -285,9 +285,9 @@ struct Loader
             return (*this);
         }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // public member
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
         OUString sName       ;
@@ -295,15 +295,15 @@ struct Loader
         OUStringList    lTypes      ;
 };
 
-//*****************************************************************************************************************
+
 // Programmer can register his own services to handle a FileType and intercept dispatches.
 // Don't forget: It's not a FrameLoader - it's a ContentHandler! (normaly without any UI)
-//*****************************************************************************************************************
+
 struct ContentHandler
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     // public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
         inline                   ContentHandler(                              ) { impl_clear();               }
@@ -312,9 +312,9 @@ struct ContentHandler
         inline ContentHandler&   operator=     ( const ContentHandler& rCopy  ) { return impl_copy( rCopy );  }
         inline void              free          (                              ) { impl_clear();               }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // private methods
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         inline void impl_clear()
@@ -330,33 +330,33 @@ struct ContentHandler
             return (*this);
         }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // public member
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
         OUString     sName   ;
         OUStringList        lTypes  ;
 };
 
-//*****************************************************************************************************************
+
 // We need different hash maps for different tables of our configuration management.
 // Follow maps convert <names> to <properties> of type, filter, detector, loader ...
 // and could be used in a generic way
-//*****************************************************************************************************************
+
 template< class HashType >
 class SetNodeHash : public ::boost::unordered_map< OUString                    ,
                                             HashType                           ,
                                             OUStringHash                  ,
                                             ::std::equal_to< OUString > >
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     // interface
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
-        //---------------------------------------------------------------------------------------------------------
+
         // The only way to free ALL memory really!
-        //---------------------------------------------------------------------------------------------------------
+
         inline void free()
         {
             SetNodeHash().swap( *this );
@@ -365,48 +365,48 @@ class SetNodeHash : public ::boost::unordered_map< OUString                    ,
             lRemovedItems.free();
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // Append changed, added or removed items to special lists
         // Necessary for saving changes
-        //---------------------------------------------------------------------------------------------------------
+
         void appendChange( const OUString& sName  ,
                                  EModifyState     eState );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     // member
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
         OUStringList  lAddedItems    ;
         OUStringList  lChangedItems  ;
         OUStringList  lRemovedItems  ;
 };
 
-//*****************************************************************************************************************
+
 // Use these hashes to implement different tables which assign types to frame loader or detect services.
 // It's an optimism to find registered services faster!
 // The preferred hash maps file extensions to preferred types to find these ones faster.
-//*****************************************************************************************************************
+
 class PerformanceHash   :   public  ::boost::unordered_map<    OUString                     ,
                                                         OUStringList                        ,
                                                         OUStringHash                    ,
                                                         ::std::equal_to< OUString >  >
 {
     public:
-        //---------------------------------------------------------------------------------------------------------
+
         //  try to free all used memory REALY!
-        //---------------------------------------------------------------------------------------------------------
+
         inline void free()
         {
             PerformanceHash().swap( *this );
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  normaly a complete string must match our hash key values ...
         //  But sometimes we need a search by using these key values as pattern!
         //  The in/out parameter "pStepper" is used to return a pointer to found element in hash ...
         //  and could be used for further searches again, which should be started at next element!
         //  We stop search at the end of hash. You can start it again by setting it to the begin by himself.
-        //---------------------------------------------------------------------------------------------------------
+
         inline sal_Bool findPatternKey( const OUString& sSearchValue ,
                                               const_iterator&  pStepper     )
         {
@@ -435,9 +435,9 @@ class PerformanceHash   :   public  ::boost::unordered_map<    OUString
         }
 };
 
-//*****************************************************************************************************************
+
 // Define easy usable types
-//*****************************************************************************************************************
+
 typedef SetNodeHash< FileType >                                     FileTypeHash                ;
 typedef SetNodeHash< Filter >                                       FilterHash                  ;
 typedef SetNodeHash< Detector >                                     DetectorHash                ;
@@ -452,9 +452,9 @@ typedef CheckedIterator< PerformanceHash >                          CheckedPerfo
 
 typedef ::std::vector< FilterHash::const_iterator >                 FilterQuery                 ;
 
-//*****************************************************************************************************************
+
 // Use private static data container to hold all values of configuration!
-//*****************************************************************************************************************
+
 class DataContainer : private ThreadHelpBase
 {
     public:
@@ -586,7 +586,7 @@ class DataContainer : private ThreadHelpBase
         sal_Bool                m_bHandlersModified         ;
 };
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          capsulate configuration access for fiter configuration
     @descr          We use the ConfigItem mechanism to read/write values from/to configuration.
                     This implementation could be used to handle standard AND additional filter configurations in the same way.
@@ -602,9 +602,9 @@ class DataContainer : private ThreadHelpBase
 *//*-*************************************************************************************************************/
 class FilterCFGAccess : public ::utl::ConfigItem
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  interface
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
                                     FilterCFGAccess ( const OUString& sPath                                  ,
                                                             sal_Int32        nVersion = DEFAULT_FILTERCACHE_VERSION ,
@@ -628,9 +628,9 @@ class FilterCFGAccess : public ::utl::ConfigItem
         void             setProductName                             (       OUStringHashMap&                                       lUINames        );
         void             resetProductName                           (       OUStringHashMap&                                       lUINames        );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  internal helper
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
         void impl_initKeyCounts        (                                            );    // set right key counts, which are used at reading/writing of set node properties
         void impl_removeNodes          (       OUStringList&        rChangesList    ,     // helper to remove list of set nodes
@@ -650,9 +650,9 @@ class FilterCFGAccess : public ::utl::ConfigItem
         void impl_saveLoaders          ( DataContainer&             rData           );
         void impl_saveContentHandlers  ( DataContainer&             rData           );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  debug checks
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
         static sal_Bool implcp_ctor ( const OUString& sPath    ,     // methods to check incoming parameter on our interface methods!
                                             sal_Int32        nVersion ,
@@ -660,9 +660,9 @@ class FilterCFGAccess : public ::utl::ConfigItem
         static sal_Bool implcp_read ( const DataContainer&   rData    );
         static sal_Bool implcp_write( const DataContainer&   rData    );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  member
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
         EFilterPackage  m_ePackage                     ;   // ... not really used yet! should split configuration in STANDARD and ADDITIONAL filter
         sal_Int32       m_nVersion                     ;   // file format version of configuration! (necessary for "xml2xcd" transformation!)
diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx
index a53a007a9185..0866a5e986f6 100644
--- a/framework/inc/classes/framecontainer.hxx
+++ b/framework/inc/classes/framecontainer.hxx
@@ -46,7 +46,7 @@ typedef ::std::vector< css::uno::Reference< css::frame::XFrame > >  TFrameContai
 typedef TFrameContainer::iterator                                   TFrameIterator      ;
 typedef TFrameContainer::const_iterator                             TConstFrameIterator ;
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          implement a container to hold children of frame, task or desktop
     @descr          Every object of frame, task or desktop hold reference to his children. These container is used as helper
                     to do this. Some helper-classe like OFrames or OTasksAccess use it to. They hold a pointer to an instance
@@ -62,7 +62,7 @@ typedef TFrameContainer::const_iterator                             TConstFrameI
 *//*-*************************************************************************************************************/
 class FrameContainer : private ThreadHelpBase
 {
-    //_______________________________________
+
     // member
 
     private:
@@ -72,7 +72,7 @@ class FrameContainer : private ThreadHelpBase
         /// one container item can be the current active frame. Its necessary for Desktop or Frame implementation.
         css::uno::Reference< css::frame::XFrame > m_xActiveFrame;
 
-    //_______________________________________
+
     // interface
 
     public:
diff --git a/framework/inc/classes/propertysethelper.hxx b/framework/inc/classes/propertysethelper.hxx
index a99e8a140b1f..a297628b67be 100644
--- a/framework/inc/classes/propertysethelper.hxx
+++ b/framework/inc/classes/propertysethelper.hxx
@@ -36,7 +36,7 @@
 
 namespace framework{
 
-//_________________________________________________________________________________________________________________
+
 
 /** supports the API XPropertySet and XPropertySetInfo.
  *
@@ -50,13 +50,13 @@ namespace framework{
 class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
                         , public css::beans::XPropertySetInfo
 {
-    //-------------------------------------------------------------------------
+
     /* types */
     protected:
 
         typedef BaseHash< css::beans::Property > TPropInfoHash;
 
-    //-------------------------------------------------------------------------
+
     /* member */
     protected:
 
@@ -73,11 +73,11 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
         LockHelper& m_rLock;
         TransactionManager& m_rTransactionManager;
 
-    //-------------------------------------------------------------------------
+
     /* native interface */
     public:
 
-        //---------------------------------------------------------------------
+
         /** initialize new instance of this helper.
          *
          *  @param  pExternalLock
@@ -97,12 +97,12 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
                                 TransactionManager*                                     pExternalTransactionManager ,
                                 sal_Bool                                                bReleaseLockOnCall          );
 
-        //---------------------------------------------------------------------
+
         /** free all needed memory.
          */
         virtual ~PropertySetHelper();
 
-        //---------------------------------------------------------------------
+
         /** set a new owner for this helper.
          *
          *  This owner is used as source for all broadcasted events.
@@ -110,7 +110,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
          */
         void impl_setPropertyChangeBroadcaster(const css::uno::Reference< css::uno::XInterface >& xBroadcaster);
 
-        //---------------------------------------------------------------------
+
         /** add a new property info to the set of supported ones.
          *
          *  @param  aProperty
@@ -128,7 +128,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
             throw(css::beans::PropertyExistException,
                   css::uno::Exception               );
 
-        //---------------------------------------------------------------------
+
         /** remove an existing property info from the set of supported ones.
          *
          *  @param  sProperty
@@ -141,7 +141,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
             throw(css::beans::UnknownPropertyException,
                   css::uno::Exception                 );
 
-        //---------------------------------------------------------------------
+
         /** mark the object as "useable for working" or "dead".
          *
          *  This correspond to the lifetime handling implemented by the base class TransactionBase.
@@ -151,7 +151,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
         virtual void SAL_CALL impl_enablePropertySet();
         virtual void SAL_CALL impl_disablePropertySet();
 
-        //---------------------------------------------------------------------
+
         /**
          */
         virtual void SAL_CALL impl_setPropertyValue(const OUString& sProperty,
@@ -161,7 +161,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
         virtual css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty,
                                                                    sal_Int32        nHandle  ) = 0;
 
-    //-------------------------------------------------------------------------
+
     /* uno interface */
     public:
 
@@ -217,7 +217,7 @@ class FWI_DLLPUBLIC PropertySetHelper : public css::beans::XPropertySet
         virtual sal_Bool SAL_CALL hasPropertyByName(const OUString& sName)
             throw(css::uno::RuntimeException, std::exception);
 
-    //-------------------------------------------------------------------------
+
     /* internal helper */
     private:
 
diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx
index c824832ae12f..ef27b690c57c 100644
--- a/framework/inc/classes/protocolhandlercache.hxx
+++ b/framework/inc/classes/protocolhandlercache.hxx
@@ -38,7 +38,7 @@ namespace framework{
 #define SETNAME_HANDLER                             DECLARE_ASCII("HandlerSet"                                      )   /// name of configuration set inside package
 #define PROPERTY_PROTOCOLS                          DECLARE_ASCII("Protocols"                                       )   /// properties of a protocol handler
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     Programmer can register his own services to handle different protocols.
@@ -58,7 +58,7 @@ struct FWI_DLLPUBLIC ProtocolHandler
         OUStringList m_lProtocols;
 };
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     This hash use registered pattern of all protocol handlers as keys and provide her
@@ -73,14 +73,14 @@ class FWI_DLLPUBLIC PatternHash : public BaseHash< OUString >
         PatternHash::iterator findPatternKey( const OUString& sURL );
 };
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     This hash holds protocol handler structs by her names.
 */
 typedef BaseHash< ProtocolHandler > HandlerHash;
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short          this hash makes it easy to find a protocol handler by using his uno implementation name.
@@ -128,7 +128,7 @@ class FWI_DLLPUBLIC HandlerCache
         void takeOver(HandlerHash* pHandler, PatternHash* pPattern);
 };
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     @short          implements configuration access for handler configuration
diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx
index cf0b5d70f2e1..aaef28cb5fd9 100644
--- a/framework/inc/classes/taskcreator.hxx
+++ b/framework/inc/classes/taskcreator.hxx
@@ -32,7 +32,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          a helper to create new tasks or sub frames for "_blank" or FrameSearchFlag::CREATE
     @descr          There are different places to create new (task)frames. Its not easy to service this code!
                     Thats the reason for this helper. He capsulate asynchronous/synchronous creation by calling
@@ -43,13 +43,13 @@ namespace framework{
 *//*-*************************************************************************************************************/
 class TaskCreator : private ThreadHelpBase
 {
-    //_______________________
+
     // member
     private:
 
         css::uno::Reference< css::uno::XComponentContext >  m_xContext;
 
-    //_______________________
+
     // interface
     public:
 
@@ -59,7 +59,7 @@ class TaskCreator : private ThreadHelpBase
         css::uno::Reference< css::frame::XFrame > createTask( const OUString& sName    ,
                                                                     sal_Bool         bVisible );
 
-    //_______________________
+
     // helper
     private:
 
diff --git a/framework/inc/classes/wildcard.hxx b/framework/inc/classes/wildcard.hxx
index 088dd18eb043..ee6217f11271 100644
--- a/framework/inc/classes/wildcard.hxx
+++ b/framework/inc/classes/wildcard.hxx
@@ -24,7 +24,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          implement wildcard-mechanism for unicode
     @descr          This class can be used to get information about the matching of a pattern to a given text.
                     It's suitable for 8-Bit- AND 16-Bit-strings!
@@ -39,17 +39,17 @@ namespace framework{
 
 class Wildcard
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      standard ctor
             @descr      We do nothing here.
 
@@ -63,7 +63,7 @@ class Wildcard
 
         Wildcard();
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      standard dtor
             @descr      We do nothing here.
 
@@ -77,11 +77,11 @@ class Wildcard
 
         virtual ~Wildcard();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  interface
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      try to find an agreement between given text and searchpattern
             @descr      You can use wildcards in pattern only!
 
diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx
index 05f694ea51e8..f5cdb15c0e28 100644
--- a/framework/inc/dispatch/closedispatcher.hxx
+++ b/framework/inc/dispatch/closedispatcher.hxx
@@ -45,7 +45,7 @@ class SystemWindow;
 
 namespace framework{
 
-//-----------------------------------------------
+
 /**
     @short          helper to dispatch the URLs ".uno:CloseDoc"/".uno:CloseWin"/".uno:CloseFrame"
                     to close a frame/document or the whole application implicitly in case it was the last frame
@@ -62,12 +62,12 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
                                     css::frame::XNotifyingDispatch,             // => XDispatch
                                     css::frame::XDispatchInformationProvider >
 {
-    //-------------------------------------------
+
     // types
 
     private:
 
-        //---------------------------------------
+
         /** @short  describe, which request must be done here.
         @descr      The incoming URLs {.uno:CloseDoc/CloseWin and CloseFrame
                     can be classified so and checked later performant.}*/
@@ -78,53 +78,53 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
             E_CLOSE_WIN
         };
 
-    //-------------------------------------------
+
     // member
 
     private:
 
-        //---------------------------------------
+
         /** @short reference to an uno service manager,
                    which can be used to create own needed
                    uno resources. */
         css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
-        //---------------------------------------
+
         /** @short  reference to the target frame, which should be
                     closed by this dispatch. */
         css::uno::WeakReference< css::frame::XFrame > m_xCloseFrame;
 
-        //---------------------------------------
+
         /** @short  used for asynchronous callbacks within the main thread.
             @descr  Internally we work asynchronous. Because our callis
                     are not aware, that her request can kill its own environment ... */
         ::vcl::EventPoster m_aAsyncCallback;
 
-        //---------------------------------------
+
         /** @short  used inside asyncronous callback to decide,
                     which operation must be executed. */
         EOperation m_eOperation;
 
-        //---------------------------------------
+
         /** @short  for asynchronous operations we must hold us self alive! */
         css::uno::Reference< css::uno::XInterface > m_xSelfHold;
 
-        //---------------------------------------
+
         /** @short  list of registered status listener */
         ListenerHash m_lStatusListener;
 
-        //---------------------------------------
+
         /** @short  holded alive for internally asynchronous operations! */
         css::uno::Reference< css::frame::XDispatchResultListener > m_xResultListener;
 
         SystemWindow* m_pSysWindow;
 
-    //-------------------------------------------
+
     // native interface
 
     public:
 
-        //---------------------------------------
+
         /** @short  connect a new CloseDispatcher instance to its frame.
             @descr  One CloseDispatcher instance is bound to onw frame only.
                     That makes an implementation (e.g. of listener support)
@@ -144,22 +144,22 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
                         const css::uno::Reference< css::frame::XFrame >&          xFrame ,
                         const OUString&                                           sTarget);
 
-        //---------------------------------------
+
         /** @short  does nothing real. */
         virtual ~CloseDispatcher();
 
-    //-------------------------------------------
+
     // uno interface
 
     public:
 
-        //---------------------------------------
+
         // XNotifyingDispatch
         virtual void SAL_CALL dispatchWithNotification( const css::util::URL&                                             aURL      ,
                                                         const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
                                                         const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception);
 
-        //---------------------------------------
+
         // XDispatch
         virtual void SAL_CALL dispatch            ( const css::util::URL&                                     aURL      ,
                                                     const css::uno::Sequence< css::beans::PropertyValue >&    lArguments) throw(css::uno::RuntimeException, std::exception);
@@ -168,17 +168,17 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
         virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
                                                     const css::util::URL&                                     aURL      ) throw(css::uno::RuntimeException, std::exception);
 
-        //---------------------------------------
+
         // XDispatchInformationProvider
         virtual css::uno::Sequence< sal_Int16 >                       SAL_CALL getSupportedCommandGroups         (                         ) throw (css::uno::RuntimeException, std::exception);
         virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception);
 
-    //-------------------------------------------
+
     // internal helper
 
     private:
 
-        //---------------------------------------
+
         /** @short  a callback for asynchronous started operations.
 
             @descr  As already mentione, we make internally all operations
@@ -187,7 +187,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
         */
         DECL_LINK( impl_asyncCallback, void* );
 
-        //---------------------------------------
+
         /** @short  prepare m_xCloseFrame so it should be closeable without problems.
 
             @descr  Thats needed to be shure, that the document cant disagree
@@ -213,7 +213,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
                                                      sal_Bool                                   bCloseAllOtherViewsToo,
                                                      sal_Bool&                                  bControllerSuspended  );
 
-        //---------------------------------------
+
         /** @short  close the member m_xCloseFrame.
 
             @descr  This method does not look for any document
@@ -230,7 +230,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
          */
         sal_Bool implts_closeFrame();
 
-        //---------------------------------------
+
         /** @short  set the special BackingComponent (now StartModule)
                     as new component of our m_xCloseFrame.
 
@@ -239,7 +239,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
          */
         sal_Bool implts_establishBackingMode();
 
-        //---------------------------------------
+
         /** @short  calls XDesktop->terminate().
 
             @descr  No office code has to be called
@@ -253,7 +253,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
          */
         sal_Bool implts_terminateApplication();
 
-        //---------------------------------------
+
         /** @short  notify a DispatchResultListener.
 
             @descr  We check the listener reference before we use it.
@@ -273,7 +273,7 @@ class CloseDispatcher : // baseclasses ... order is necessary for right initiali
                                                sal_Int16                                                   nState   ,
                                          const css::uno::Any&                                              aResult  );
 
-        //---------------------------------------
+
         /** @short  try to find the right target frame where this close request
                     must be really done.
 
diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx
index 36fe400dcc39..1f5fcb23c9f4 100644
--- a/framework/inc/dispatch/dispatchinformationprovider.hxx
+++ b/framework/inc/dispatch/dispatchinformationprovider.hxx
@@ -36,20 +36,20 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          a helper to merge dispatch information of different sources together.
 *//*-*************************************************************************************************************/
 class DispatchInformationProvider : private ThreadHelpBase
                                   , public  ::cppu::WeakImplHelper1< css::frame::XDispatchInformationProvider >
 {
-    //_______________________
+
     // member
     private:
 
         css::uno::Reference< css::uno::XComponentContext > m_xContext;
         css::uno::WeakReference< css::frame::XFrame > m_xFrame;
 
-    //_______________________
+
     // interface
     public:
 
@@ -64,7 +64,7 @@ class DispatchInformationProvider : private ThreadHelpBase
         virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
             throw (css::uno::RuntimeException, std::exception);
 
-    //_______________________
+
     // helper
     private:
 
diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx
index 55c630ce3f89..2f2162e5a92a 100644
--- a/framework/inc/dispatch/interceptionhelper.hxx
+++ b/framework/inc/dispatch/interceptionhelper.hxx
@@ -55,7 +55,7 @@ class InterceptionHelper : // order of base classes is important for right initi
                                      css::frame::XDispatchProviderInterception,
                                      css::lang::XEventListener >
 {
-    //_____________________________________________________
+
     // structs, helper
 
     /** @short bind an interceptor component to it's URL pattern registration. */
@@ -73,7 +73,7 @@ class InterceptionHelper : // order of base classes is important for right initi
         css::uno::Sequence< OUString > lURLPattern;
     };
 
-    //_____________________________________________________
+
 
     /** @short implements a list of items of type InterceptorInfo, and provides some special
                functions on it.
@@ -85,7 +85,7 @@ class InterceptionHelper : // order of base classes is important for right initi
     {
         public:
 
-            //_____________________________________________
+
 
             /** @short search for an interceptor inside this list using it's reference.
 
@@ -107,7 +107,7 @@ class InterceptionHelper : // order of base classes is important for right initi
                 return end();
             }
 
-            //_____________________________________________
+
 
             /** @short search for an interceptor inside this list using it's reference.
 
@@ -136,7 +136,7 @@ class InterceptionHelper : // order of base classes is important for right initi
             }
     };
 
-    //_____________________________________________________
+
     // member
 
     private:
@@ -157,12 +157,12 @@ class InterceptionHelper : // order of base classes is important for right initi
                    The last or the first registered one. */
         static sal_Bool m_bPreferrFirstInterceptor;
 
-    //_____________________________________________________
+
     // native interface
 
     public:
 
-        //_________________________________________________
+
 
         /** @short creates a new interception helper instance.
 
@@ -177,7 +177,7 @@ class InterceptionHelper : // order of base classes is important for right initi
 
     protected:
 
-        //_________________________________________________
+
 
         /** @short standard destructor.
 
@@ -187,12 +187,12 @@ class InterceptionHelper : // order of base classes is important for right initi
          */
         virtual ~InterceptionHelper();
 
-    //_____________________________________________________
+
     // uno interface
 
     public:
 
-        //_________________________________________________
+
         // XDispatchProvider
 
         /** @short  query for a dispatch, which implements the requested feature.
@@ -220,7 +220,7 @@ class InterceptionHelper : // order of base classes is important for right initi
                                                                                           sal_Int32        nSearchFlags    )
             throw(css::uno::RuntimeException, std::exception);
 
-        //_________________________________________________
+
         // XDispatchProvider
 
         /** @short implements an optimized queryDispatch() for remote.
@@ -237,7 +237,7 @@ class InterceptionHelper : // order of base classes is important for right initi
         virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL queryDispatches(const css::uno::Sequence< css::frame::DispatchDescriptor >& lDescriptor)
             throw(css::uno::RuntimeException, std::exception);
 
-        //_________________________________________________
+
         // XDispatchProviderInterception
 
         /** @short      register an interceptor.
@@ -256,7 +256,7 @@ class InterceptionHelper : // order of base classes is important for right initi
         virtual void SAL_CALL registerDispatchProviderInterceptor(const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
             throw(css::uno::RuntimeException, std::exception);
 
-        //_________________________________________________
+
         // XDispatchProviderInterception
 
         /** @short      release an interceptor.
@@ -271,7 +271,7 @@ class InterceptionHelper : // order of base classes is important for right initi
          */
         virtual void SAL_CALL releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception );
 
-        //_________________________________________________
+
         // XEventListener
 
         /** @short      Is called from our owner frame, in case he will be disposed.
diff --git a/framework/inc/dispatch/menudispatcher.hxx b/framework/inc/dispatch/menudispatcher.hxx
index 2a9201525024..9cb73ae48aef 100644
--- a/framework/inc/dispatch/menudispatcher.hxx
+++ b/framework/inc/dispatch/menudispatcher.hxx
@@ -48,7 +48,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     We must save information about our listener and URL for listening.
     We implement this as a hashtable for strings.
 *//*-*************************************************************************************************************/
@@ -57,7 +57,7 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<  OUString         ,
                                                         OUStringHash > IMPL_ListenerHashContainer;
 
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          helper for desktop only(!) to create new tasks on demand for dispatches
     @descr          Use this class as member only! Never use it as baseclass.
                     XInterface will be ambigous and we hold a weakcss::uno::Reference to ouer OWNER - not to ouer SUPERCLASS!
@@ -80,17 +80,17 @@ class MenuDispatcher   :        // baseclasses
                                             css::frame::XDispatch           ,
                                             css::frame::XFrameActionListener >
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      standard ctor
             @descr      These initialize a new instance of ths class with needed information for work.
 
@@ -106,11 +106,11 @@ class MenuDispatcher   :        // baseclasses
         MenuDispatcher(    const   css::uno::Reference< css::uno::XComponentContext >& rxContext    ,
                             const   css::uno::Reference< css::frame::XFrame >&              xOwner      );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XDispatch
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      dispatch URL with arguments
             @descr      Every dispatch create a new task. If load of URL failed task will deleted automaticly!
 
@@ -126,7 +126,7 @@ class MenuDispatcher   :        // baseclasses
         virtual void SAL_CALL dispatch( const   css::util::URL&                                     aURL            ,
                                         const   css::uno::Sequence< css::beans::PropertyValue >&    seqProperties   ) throw( css::uno::RuntimeException, std::exception );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      add listener for state events
             @descr      You can add a listener to get information about status of dispatch: OK or Failed.
 
@@ -143,7 +143,7 @@ class MenuDispatcher   :        // baseclasses
         virtual void SAL_CALL addStatusListener(    const   css::uno::Reference< css::frame::XStatusListener >& xControl,
                                                     const   css::util::URL&                                     aURL    ) throw( css::uno::RuntimeException, std::exception );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      remove listener for state events
             @descr      You can remove a listener if information of dispatch isn't important for you any longer.
 
@@ -161,17 +161,17 @@ class MenuDispatcher   :        // baseclasses
                                                     const   css::util::URL&                                     aURL    ) throw( css::uno::RuntimeException, std::exception );
 
 
-        //---------------------------------------------------------------------------------------------------------
+
         //   XFrameActionListener
-        //---------------------------------------------------------------------------------------------------------
+
 
         virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException, std::exception );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //   XEventListener
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      dispose current instance
             @descr      If service helper isn't required any longer call this method to release all used resources.
 
@@ -185,13 +185,13 @@ class MenuDispatcher   :        // baseclasses
 
         void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  protected methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     protected:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      standard destructor
             @descr      This method destruct an instance of this class and clear some member.
                         This method is protected, because its not allowed to use an instance of this class as a member!
@@ -207,13 +207,13 @@ class MenuDispatcher   :        // baseclasses
 
         virtual ~MenuDispatcher();
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      -
             @descr      -
 
@@ -227,7 +227,7 @@ class MenuDispatcher   :        // baseclasses
 
         sal_Bool impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromResource = sal_False );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      -
             @descr      -
 
@@ -241,10 +241,10 @@ class MenuDispatcher   :        // baseclasses
 
         void impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  variables
     //  (should be private everyway!)
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx
index 2ec6b630dc1b..706901fc2c92 100644
--- a/framework/inc/dispatch/oxt_handler.hxx
+++ b/framework/inc/dispatch/oxt_handler.hxx
@@ -43,7 +43,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          handler to detect and play sounds ("wav" and "au" only!)
     @descr          Register this implementation as a content handler to detect and/or play wav- and au-sounds.
                     It doesn't depend from the target platform. But one instance of this class
@@ -63,32 +63,32 @@ class Oxt_Handler  :    // baseclasses
                                     css::frame::XNotifyingDispatch, // => XDispatch
                                     css::document::XExtendedFilterDetection >
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
+
                  Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
         virtual ~Oxt_Handler(                                                                        );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XInterface, XTypeProvider, XServiceInfo
-        //---------------------------------------------------------------------------------------------------------
+
         DECLARE_XSERVICEINFO
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XNotifyingDispatch
-        //---------------------------------------------------------------------------------------------------------
+
         virtual void SAL_CALL dispatchWithNotification(const css::util::URL&                                             aURL      ,
                                                        const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
                                                        const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw( css::uno::RuntimeException, std::exception );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XDispatch
-        //---------------------------------------------------------------------------------------------------------
+
         virtual void SAL_CALL dispatch              (  const css::util::URL&                                     aURL        ,
                                                        const css::uno::Sequence< css::beans::PropertyValue >&    lArguments  ) throw( css::uno::RuntimeException, std::exception );
         // not supported !
@@ -97,25 +97,23 @@ class Oxt_Handler  :    // baseclasses
         virtual void SAL_CALL removeStatusListener  (  const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/   ,
                                                        const css::util::URL&                                     /*aURL*/        ) throw( css::uno::RuntimeException, std::exception ) {};
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XExtendedFilterDetection
-        //---------------------------------------------------------------------------------------------------------
         virtual OUString SAL_CALL detect     (        css::uno::Sequence< css::beans::PropertyValue >&    lDescriptor ) throw( css::uno::RuntimeException, std::exception );
 
-    //-------------------------------------------------------------------------------------------------------------
     //  protected methods
-    //-------------------------------------------------------------------------------------------------------------
+
     protected:
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  variables
     //  (should be private everyway!)
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         css::uno::Reference< css::lang::XMultiServiceFactory >     m_xFactory          ;   /// global uno service factory to create new services
diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx
index b35fb4c8c11a..8b58855574e5 100644
--- a/framework/inc/dispatch/popupmenudispatcher.hxx
+++ b/framework/inc/dispatch/popupmenudispatcher.hxx
@@ -50,7 +50,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     We must save information about our listener and URL for listening.
     We implement this as a hashtable for strings.
 *//*-*************************************************************************************************************/
@@ -59,7 +59,7 @@ typedef ::cppu::OMultiTypeInterfaceContainerHelperVar<  OUString         ,
                                                         OUStringHash > IMPL_ListenerHashContainer;
 
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          helper for desktop only(!) to create new tasks on demand for dispatches
     @descr          Use this class as member only! Never use it as baseclass.
                     XInterface will be ambigous and we hold a weakcss::uno::Reference to ouer OWNER - not to our SUPERCLASS!
@@ -85,9 +85,9 @@ class PopupMenuDispatcher :     // baseclasses
                                            css::frame::XFrameActionListener,
                                            css::lang::XInitialization >
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
         //  constructor / destructor
diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx
index 966ba30e0d15..681593bf5bbc 100644
--- a/framework/inc/dispatch/startmoduledispatcher.hxx
+++ b/framework/inc/dispatch/startmoduledispatcher.hxx
@@ -44,7 +44,7 @@
 
 namespace framework{
 
-//-----------------------------------------------
+
 /**
     @short          helper to handle all URLs related to the StartModule
  */
@@ -54,35 +54,35 @@ class StartModuleDispatcher : // baseclasses ... order is necessary for right in
                                          css::frame::XNotifyingDispatch,             // => XDispatch
                                          css::frame::XDispatchInformationProvider >
 {
-    //-------------------------------------------
+
     // member
 
     private:
 
-        //---------------------------------------
+
         /** @short reference to an uno service manager,
                    which can be used to create own needed
                    uno resources. */
         css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
-        //---------------------------------------
+
         /** @short  our "context" frame. */
         css::uno::WeakReference< css::frame::XFrame > m_xOwner;
 
-        //---------------------------------------
+
         /** @short  the original queryDispatch() target. */
         OUString m_sDispatchTarget;
 
-        //---------------------------------------
+
         /** @short  list of registered status listener */
         ListenerHash m_lStatusListener;
 
-    //-------------------------------------------
+
     // native interface
 
     public:
 
-        //---------------------------------------
+
         /** @short  connect a new StartModuleDispatcher instance to its "owner frame".
 
             @descr  Such "owner frame" is used as context for all related operations.
@@ -101,24 +101,24 @@ class StartModuleDispatcher : // baseclasses ... order is necessary for right in
                               const css::uno::Reference< css::frame::XFrame >&              xFrame ,
                               const OUString&                                        sTarget);
 
-        //---------------------------------------
+
         /** @short  does nothing real. */
         virtual ~StartModuleDispatcher();
 
-    //-------------------------------------------
+
     // uno interface
 
     public:
 
-        //---------------------------------------
 
-        //---------------------------------------
+
+
         // XNotifyingDispatch
         virtual void SAL_CALL dispatchWithNotification( const css::util::URL&                                             aURL      ,
                                                         const css::uno::Sequence< css::beans::PropertyValue >&            lArguments,
                                                         const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception);
 
-        //---------------------------------------
+
         // XDispatch
         virtual void SAL_CALL dispatch            ( const css::util::URL&                                     aURL      ,
                                                     const css::uno::Sequence< css::beans::PropertyValue >&    lArguments) throw(css::uno::RuntimeException, std::exception);
@@ -127,22 +127,22 @@ class StartModuleDispatcher : // baseclasses ... order is necessary for right in
         virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xListener ,
                                                     const css::util::URL&                                     aURL      ) throw(css::uno::RuntimeException, std::exception);
 
-        //---------------------------------------
+
         // XDispatchInformationProvider
         virtual css::uno::Sequence< sal_Int16 >                       SAL_CALL getSupportedCommandGroups         (                         ) throw (css::uno::RuntimeException, std::exception);
         virtual css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL getConfigurableDispatchInformation( sal_Int16 nCommandGroup ) throw (css::uno::RuntimeException, std::exception);
 
-    //-------------------------------------------
+
     // internal helper
 
     private:
 
-        //---------------------------------------
+
         /** @short  check if StartModule can be shown.
          */
         ::sal_Bool implts_isBackingModePossible();
 
-        //---------------------------------------
+
         /** @short  open the special BackingComponent (now StartModule)
 
             @return [bool]
@@ -150,7 +150,7 @@ class StartModuleDispatcher : // baseclasses ... order is necessary for right in
          */
         ::sal_Bool implts_establishBackingMode();
 
-        //---------------------------------------
+
         /** @short  notify a DispatchResultListener.
 
             @descr  We check the listener reference before we use it.
diff --git a/framework/inc/dispatchcommands.h b/framework/inc/dispatchcommands.h
index 4b43e2897295..3f923191bbcb 100644
--- a/framework/inc/dispatchcommands.h
+++ b/framework/inc/dispatchcommands.h
@@ -24,7 +24,7 @@
 
 namespace framework{
 
-//_________________________________________________________________________________________________________________
+
 
 #define CMD_UNO_SHOWSTARTMODULE ".uno:ShowStartModule"
 
diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx
index e14c1071cc3a..8c302e67d52c 100644
--- a/framework/inc/helper/dockingareadefaultacceptor.hxx
+++ b/framework/inc/helper/dockingareadefaultacceptor.hxx
@@ -34,7 +34,7 @@
 
 namespace framework{
 
-//_________________________________________________________________________________________________________________
+
 
 
 class DockingAreaDefaultAcceptor    :   private ThreadHelpBase                                      ,
@@ -42,11 +42,11 @@ class DockingAreaDefaultAcceptor    :   private ThreadHelpBase
 {
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      constructor to initialize this instance
             @descr      A docking area acceptor
                         But we need a instance to create more then one enumerations to the same tasklist!
@@ -64,19 +64,19 @@ class DockingAreaDefaultAcceptor    :   private ThreadHelpBase
          DockingAreaDefaultAcceptor(    const css::uno::Reference< css::frame::XFrame >& xOwner );
         virtual ~DockingAreaDefaultAcceptor();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XDockingAreaAcceptor
-        //---------------------------------------------------------------------------------------------------------
+
 
         virtual css::uno::Reference< css::awt::XWindow > SAL_CALL getContainerWindow() throw (css::uno::RuntimeException, std::exception);
         virtual sal_Bool SAL_CALL requestDockingAreaSpace( const css::awt::Rectangle& RequestedSpace ) throw (css::uno::RuntimeException, std::exception);
         virtual void SAL_CALL setDockingAreaSpace( const css::awt::Rectangle& BorderSpace ) throw (css::uno::RuntimeException, std::exception);
 
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  variables
     //  (should be private everyway!)
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx
index 15c87c3d6b5f..225088c04966 100644
--- a/framework/inc/helper/mischelper.hxx
+++ b/framework/inc/helper/mischelper.hxx
@@ -148,14 +148,14 @@ FWI_DLLPUBLIC void FillLangItems( std::set< OUString > &rLangItems,
 
 //It's common for an object to want to create and own a Broadcaster and set
 //itself as a Listener on its own Broadcaster member.
-//
+
 //However, calling addListener on a Broadcaster means that the Broadcaster adds
 //a reference to the Listener leading to an ownership cycle where the Listener
 //owns the Broadcaster which "owns" the Listener.
-//
+
 //The WeakContainerListener allows breaking this cycle and retrofitting
 //afflicted implentations fairly easily.
-//
+
 //OriginalListener owns the Broadcaster which "owns" the WeakContainerListener
 //which forwards the events to the OriginalListener without taking ownership of
 //it.
diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx
index 306686f37a74..5e4cb9ae58a9 100644
--- a/framework/inc/helper/ocomponentaccess.hxx
+++ b/framework/inc/helper/ocomponentaccess.hxx
@@ -38,7 +38,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          implement XEnumerationAccess interface as helper to create many oneway enumeration of components
     @descr          We share mutex and framecontainer with ouer owner and have full access to his child tasks.
                     (Ouer owner can be the Desktop only!) We create oneway enumerations on demand. These "lists"
@@ -59,17 +59,17 @@ namespace framework{
 class OComponentAccess  :   private ThreadHelpBase                      ,   // Must be the first of baseclasses - Is necessary for right initialization of objects!
                             public ::cppu::WeakImplHelper1< ::com::sun::star::container::XEnumerationAccess >
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      constructor to initialize this instance
             @descr      A desktop will create an enumeration-access-object. An enumeration is a oneway-list and a
                         snapshot of the components of current tasks under the desktop.
@@ -86,11 +86,11 @@ class OComponentAccess  :   private ThreadHelpBase                      ,   // M
 
         OComponentAccess( const css::uno::Reference< css::frame::XDesktop >& xOwner );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XEnumerationAccess
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      create a new enumeration of components
             @descr      You can call this method to get a new snapshot from all components of all tasks of the desktop as an enumeration.
 
@@ -107,11 +107,11 @@ class OComponentAccess  :   private ThreadHelpBase                      ,   // M
 
         virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createEnumeration() throw( css::uno::RuntimeException, std::exception );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XElementAccess
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      get the type of elements in enumeration
             @descr      -
 
@@ -126,7 +126,7 @@ class OComponentAccess  :   private ThreadHelpBase                      ,   // M
 
         virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      get state of componentlist of enumeration.
             @descr      -
 
@@ -141,13 +141,13 @@ class OComponentAccess  :   private ThreadHelpBase                      ,   // M
 
         virtual sal_Bool SAL_CALL hasElements() throw( css::uno::RuntimeException, std::exception );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  protected methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     protected:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      standard destructor
             @descr      This method destruct an instance of this class and clear some member.
                         Don't use an instance of this class as normal member. Use it dynamicly with a pointer.
@@ -164,13 +164,13 @@ class OComponentAccess  :   private ThreadHelpBase                      ,   // M
 
         virtual ~OComponentAccess();
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      recursive method (!) to collect all components of all frames from the subtree of given node
             @descr      This is necessary to create the enumeration.
 
@@ -187,7 +187,7 @@ class OComponentAccess  :   private ThreadHelpBase                      ,   // M
         void impl_collectAllChildComponents(    const   css::uno::Reference< css::frame::XFramesSupplier >&                 xNode           ,
                                                           css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >&   seqComponents   );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      get the component of a frame
             @descr      The component of a frame can be the window, the controller or the model.
 
@@ -201,12 +201,12 @@ class OComponentAccess  :   private ThreadHelpBase                      ,   // M
 
         css::uno::Reference< css::lang::XComponent > impl_getFrameComponent( const css::uno::Reference< css::frame::XFrame >& xFrame ) const;
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  debug methods
     //  (should be private everyway!)
-    //-------------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      debug-method to check incoming parameter of some other mehods of this class
             @descr      The following methods are used to check parameters for other methods
                         of this class. The return value is used directly for an ASSERT(...).
@@ -224,10 +224,10 @@ class OComponentAccess  :   private ThreadHelpBase                      ,   // M
 
         static sal_Bool impldbg_checkParameter_OComponentAccessCtor( const css::uno::Reference< css::frame::XDesktop >& xOwner );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  variables
     //  (should be private everyway!)
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx
index e40b60203a06..1b397f050578 100644
--- a/framework/inc/helper/ocomponentenumeration.hxx
+++ b/framework/inc/helper/ocomponentenumeration.hxx
@@ -34,7 +34,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          implement a helper for a oneway enumeration of components
     @descr          You can step during this list only for one time! Its a snapshot.
                     Don't forget to release the reference. You are the owner of an instance of this implementation.
@@ -55,17 +55,17 @@ namespace framework{
 class OComponentEnumeration :   public ThreadHelpBase               ,
                                 public ::cppu::WeakImplHelper2< ::com::sun::star::container::XEnumeration,::com::sun::star::lang::XEventListener >
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      constructor to initialize this enumeration
             @descr      An enumeration is a list with oneway-access! You can get every member only for one time.
                         This method allow to initialize this oneway list with values.
@@ -80,11 +80,11 @@ class OComponentEnumeration :   public ThreadHelpBase               ,
 
          OComponentEnumeration( const css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XEventListener
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      last chance to release all references and free memory
             @descr      This method is called, if the enumeration is used completely and has no more elements.
                         Then we must destroy ouer list and release all references to other objects.
@@ -99,11 +99,11 @@ class OComponentEnumeration :   public ThreadHelpBase               ,
 
         virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XEnumeration
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      check count of accessible elements of enumeration
             @descr      You can call this method to get information about accessible elements in future.
                         Elements you have already getted are not accessible!
@@ -120,7 +120,7 @@ class OComponentEnumeration :   public ThreadHelpBase               ,
 
         virtual sal_Bool SAL_CALL hasMoreElements() throw( css::uno::RuntimeException, std::exception );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      give the next element, if some exist
             @descr      If a call "hasMoreElements()" return true, you can get the next element of list.
 
@@ -136,13 +136,13 @@ class OComponentEnumeration :   public ThreadHelpBase               ,
                                                              css::lang::WrappedTargetException      ,
                                                             css::uno::RuntimeException, std::exception              );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  protected methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     protected:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      standard destructor
             @descr      This method destruct an instance of this class and clear some member.
                         We make it protected, because its not supported to use this class as normal instance!
@@ -158,7 +158,7 @@ class OComponentEnumeration :   public ThreadHelpBase               ,
 
         virtual ~OComponentEnumeration();
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      reset instance to default values
 
             @descr      There are two ways to delete an instance of this class.<BR>
@@ -178,18 +178,18 @@ class OComponentEnumeration :   public ThreadHelpBase               ,
 
         virtual void impl_resetObject();
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  debug methods
     //  (should be private everyway!)
-    //-------------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      debug-method to check incoming parameter of some other mehods of this class
             @descr      The following methods are used to check parameters for other methods
                         of this class. The return value is used directly for an ASSERT(...).
@@ -208,10 +208,10 @@ class OComponentEnumeration :   public ThreadHelpBase               ,
         static sal_Bool impldbg_checkParameter_OComponentEnumerationCtor    (   const   css::uno::Sequence< css::uno::Reference< css::lang::XComponent > >& seqComponents   );
         static sal_Bool impldbg_checkParameter_disposing                    (   const   css::lang::EventObject&                                             aEvent          );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  variables
     //  (should be private everyway!)
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx
index 89d2512235ad..a6b42e71bddf 100644
--- a/framework/inc/helper/oframes.hxx
+++ b/framework/inc/helper/oframes.hxx
@@ -36,7 +36,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          implement XFrames, XIndexAccess and XElementAccess interfaces as helper for services
     @descr          Use this class as helper for these interfaces. We share mutex and framecontainer with ouer owner.
                     The framecontainer is a member of it from type "FrameContainer". That means;
@@ -60,7 +60,7 @@ class OFrames   :   private ThreadHelpBase      ,   // Must be the first of base
 {
     public:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      standard ctor
             @descr      These initialize a new instance of this class with all needed information for work.
                         We share framecontainer with owner implementation! It's a threadsafe container.
@@ -78,7 +78,7 @@ class OFrames   :   private ThreadHelpBase      ,   // Must be the first of base
 
         //  XFrames
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      append frame to container
             @descr      We share the container with ouer owner. We can do this only, if no lock is set on container.
                         Valid references are accepted only!
@@ -92,7 +92,7 @@ class OFrames   :   private ThreadHelpBase      ,   // Must be the first of base
         *//*-*****************************************************************************************************/
         virtual void SAL_CALL append( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      remove frame from container
             @descr      This is the companion to append(). We only accept valid references and don't work, if
                         a lock is set.
@@ -106,7 +106,7 @@ class OFrames   :   private ThreadHelpBase      ,   // Must be the first of base
         *//*-*****************************************************************************************************/
         virtual void SAL_CALL remove( const css::uno::Reference< css::frame::XFrame >& xFrame ) throw( css::uno::RuntimeException, std::exception );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      return list of all applicable frames for given flags
             @descr      Call these to get a list of all frames, which are match with given search flags.
 
@@ -121,7 +121,7 @@ class OFrames   :   private ThreadHelpBase      ,   // Must be the first of base
 
         //  XIndexAccess
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      get count of all current frames in container
             @descr      This is the beginning of full index-access. With a count you can step over all items in container.
                         Next call should be getByIndex(). But these mechanism works only, if no lock in container is set!
@@ -136,7 +136,7 @@ class OFrames   :   private ThreadHelpBase      ,   // Must be the first of base
         *//*-*****************************************************************************************************/
         virtual sal_Int32 SAL_CALL getCount() throw( css::uno::RuntimeException, std::exception );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      get specified container item by index
             @descr      If you called getCount() successful - this method return the specified element as an Any.
                         You must observe the range from 0 to count-1! Otherwise an IndexOutOfBoundsException is thrown.
@@ -156,7 +156,7 @@ class OFrames   :   private ThreadHelpBase      ,   // Must be the first of base
 
         //  XElementAccess
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      get uno-type of all container items
             @descr      In current implementation type is fixed to XFrame!
                         (container-lock is ignored)
@@ -170,7 +170,7 @@ class OFrames   :   private ThreadHelpBase      ,   // Must be the first of base
         *//*-*****************************************************************************************************/
         virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException, std::exception );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      get fill state of current container
             @descr      Call these to get information about, if items exist in container or not.
                         (container-lock is ignored)
@@ -187,7 +187,7 @@ class OFrames   :   private ThreadHelpBase      ,   // Must be the first of base
 
     protected:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      standard destructor
             @descr      This method destruct an instance of this class and clear some member.
                         This method is protected, because its not allowed to use this class as a member!
@@ -202,7 +202,7 @@ class OFrames   :   private ThreadHelpBase      ,   // Must be the first of base
         *//*-*****************************************************************************************************/
         virtual ~OFrames();
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      reset instance to default values
             @descr      There are two ways to delete an instance of this class.<BR>
                         1) delete with destructor<BR>
@@ -222,7 +222,7 @@ class OFrames   :   private ThreadHelpBase      ,   // Must be the first of base
 
     private:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      append one sequence to another
             @descr      There is no operation to add to sequences! Use this helper-method to do this.
 
@@ -240,7 +240,7 @@ class OFrames   :   private ThreadHelpBase      ,   // Must be the first of base
     //  debug methods
     //  (should be private everyway!)
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      debug-method to check incoming parameter of some other mehods of this class
             @descr      The following methods are used to check parameters for other methods
                         of this class. The return value is used directly for an ASSERT(...).
diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx
index d9dd42b5760d..f6926d83bf18 100644
--- a/framework/inc/helper/persistentwindowstate.hxx
+++ b/framework/inc/helper/persistentwindowstate.hxx
@@ -37,7 +37,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          listener for closing document frames to make her window state persistent
     @descr          It's a feature of our office. If a document window was created by ourself (and not from
                     any external process e.g. the office bean) we save and restore the window state of it
@@ -63,7 +63,7 @@ class PersistentWindowState :   // baseclasses (order necessary for right initia
                                            css::lang::XInitialization,
                                            css::frame::XFrameActionListener > // => XEventListener
 {
-    //________________________________
+
     // member
 
     private:
@@ -77,37 +77,37 @@ class PersistentWindowState :   // baseclasses (order necessary for right initia
         /// we call SetWindowState one times only for the same frame!
         sal_Bool m_bWindowStateAlreadySet;
 
-    //________________________________
+
     // interface
 
     public:
 
-        //____________________________
+
         // ctor/dtor
                  PersistentWindowState(const css::uno::Reference< css::uno::XComponentContext >& xContext);
         virtual ~PersistentWindowState(                                                                   );
 
-        //____________________________
+
         // XInitialization
         virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
             throw(css::uno::Exception       ,
                   css::uno::RuntimeException, std::exception);
 
-        //____________________________
+
         // XFrameActionListener
         virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent)
             throw(css::uno::RuntimeException, std::exception);
 
-        //____________________________
+
         // XEventListener
         virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
             throw(css::uno::RuntimeException, std::exception);
 
-    //________________________________
+
     // helper
 
     private:
-        //____________________________
+
         /** @short  identify the application module, which  is used behind the component
                     of our frame.
 
@@ -123,7 +123,7 @@ class PersistentWindowState :   // baseclasses (order necessary for right initia
         static OUString implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                                      const css::uno::Reference< css::frame::XFrame >&              xFrame);
 
-        //____________________________
+
         /** @short  retrieve the window state from the configuration.
 
             @param  rxContext
@@ -139,7 +139,7 @@ class PersistentWindowState :   // baseclasses (order necessary for right initia
         static OUString implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext      ,
                                                                const OUString&                                    sModuleName);
 
-        //____________________________
+
         /** @short  retrieve the window state from the container window.
 
             @param  xWindow
@@ -152,7 +152,7 @@ class PersistentWindowState :   // baseclasses (order necessary for right initia
          */
         static OUString implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow);
 
-        //____________________________
+
         /** @short  restore the position and size on the container window.
 
             @param  rxContext
@@ -169,7 +169,7 @@ class PersistentWindowState :   // baseclasses (order necessary for right initia
                                                   const OUString&                                    sModuleName   ,
                                                   const OUString&                                    sWindowState  );
 
-        //____________________________
+
         /** @short  restore the position and size on the container window.
 
             @param  xWindow
diff --git a/framework/inc/helper/statusindicator.hxx b/framework/inc/helper/statusindicator.hxx
index c7f59a76ae5b..a5ddac56d32b 100644
--- a/framework/inc/helper/statusindicator.hxx
+++ b/framework/inc/helper/statusindicator.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INC_HELPER_STATUSINDICATOR_HXX
 #define INCLUDED_FRAMEWORK_INC_HELPER_STATUSINDICATOR_HXX
 
-//_______________________________________________
+
 // include files of own module
 
 #include <helper/statusindicatorfactory.hxx>
@@ -29,11 +29,11 @@
 #include <macros/xtypeprovider.hxx>
 #include <macros/generic.hxx>
 
-//_______________________________________________
+
 // include UNO interfaces
 #include <com/sun/star/task/XStatusIndicator.hpp>
 
-//_______________________________________________
+
 // include all others
 #include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/weakref.hxx>
@@ -42,7 +42,7 @@
 namespace framework{
 
 
-//_______________________________________________
+
 /**
     @short          implement a status indicator object
 
@@ -62,7 +62,7 @@ namespace framework{
 class StatusIndicator : private ThreadHelpBase                  // Order of baseclasses is necessary for right initializaton!
                       , public  ::cppu::WeakImplHelper1< css::task::XStatusIndicator >
 {
-    //-------------------------------------------
+
     // member
     private:
 
@@ -76,11 +76,11 @@ class StatusIndicator : private ThreadHelpBase                  // Order of base
          */
         css::uno::WeakReference< css::task::XStatusIndicatorFactory > m_xFactory;
 
-    //-------------------------------------------
+
     // c++ interface
     public:
 
-        //----------------------------------------
+
         /** @short  initialize new instance of this class.
 
             @param  pFactory
@@ -88,16 +88,16 @@ class StatusIndicator : private ThreadHelpBase                  // Order of base
          */
         StatusIndicator(StatusIndicatorFactory* pFactory);
 
-        //----------------------------------------
+
         /** @short  does nothing real ....
          */
         virtual ~StatusIndicator();
 
-    //-------------------------------------------
+
     // uno interface
     public:
 
-        //---------------------------------------
+
         // XStatusIndicator
         virtual void SAL_CALL start(const OUString& sText ,
                                           sal_Int32        nRange)
diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx
index 37300bba9fd8..57c8271fd503 100644
--- a/framework/inc/helper/statusindicatorfactory.hxx
+++ b/framework/inc/helper/statusindicatorfactory.hxx
@@ -24,7 +24,7 @@
 // with solaris headers ...
 #include <vector>
 
-//_______________________________________________
+
 // include files of own module
 #include <helper/wakeupthread.hxx>
 #include <threadhelp/threadhelpbase.hxx>
@@ -34,7 +34,7 @@
 #include <macros/generic.hxx>
 #include <general.h>
 
-//_______________________________________________
+
 // include uno interfaces
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@@ -59,7 +59,7 @@
 namespace framework{
 
 
-//===============================================
+
 /**
     @descr  This struct hold some information about all currently running progress proccesses.
             Because the can be used on a stack, we must cache her states but must paint only
@@ -67,7 +67,7 @@ namespace framework{
  */
 struct IndicatorInfo
 {
-    //-------------------------------------------
+
     // member
     public:
 
@@ -84,11 +84,11 @@ struct IndicatorInfo
         /** @short  the last set value for this indicator */
         sal_Int32 m_nValue;
 
-    //-------------------------------------------
+
     // interface
     public:
 
-        //---------------------------------------
+
         /** @short  initialize new instance of this class
 
             @param  xIndicator
@@ -110,7 +110,7 @@ struct IndicatorInfo
             m_nValue     = 0         ;
         }
 
-        //---------------------------------------
+
         /** @short  Don't forget to free used references!
          */
         ~IndicatorInfo()
@@ -118,7 +118,7 @@ struct IndicatorInfo
             m_xIndicator.clear();
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         /** @short  Used to locate an info struct inside a stl structure ...
 
             @descr  The indicator object itself is used as key. Its values
@@ -131,11 +131,11 @@ struct IndicatorInfo
         }
 };
 
-//===============================================
+
 /** @descr  Define a lits of child indicator objects and her data. */
 typedef ::std::vector< IndicatorInfo > IndicatorStack;
 
-//===============================================
+
 /** @short          implement a factory service to create new status indicator objects
 
     @descr          Internally it uses:
@@ -158,7 +158,7 @@ class StatusIndicatorFactory : private ThreadHelpBase
                                            , css::task::XStatusIndicatorFactory
                                            , css::util::XUpdatable >
 {
-    //-------------------------------------------
+
     // member
     private:
 
@@ -202,7 +202,7 @@ class StatusIndicatorFactory : private ThreadHelpBase
         /** prevent recursive calling of Application::Reschedule(). */
         static sal_Int32 m_nInReschedule;
 
-    //-------------------------------------------
+
     // interface
 
     public:
@@ -228,23 +228,23 @@ class StatusIndicatorFactory : private ThreadHelpBase
             return aSeq;
         }
 
-        //---------------------------------------
+
         // XInitialization
         virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
             throw(css::uno::Exception       ,
                   css::uno::RuntimeException, std::exception);
 
-        //---------------------------------------
+
         // XStatusIndicatorFactory
         virtual css::uno::Reference< css::task::XStatusIndicator > SAL_CALL createStatusIndicator()
             throw(css::uno::RuntimeException, std::exception);
 
-        //---------------------------------------
+
         // XUpdatable
         virtual void SAL_CALL update()
             throw(css::uno::RuntimeException, std::exception);
 
-        //---------------------------------------
+
         // similar (XStatusIndicator)
         virtual void start(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
                            const OUString&                                    sText ,
@@ -260,14 +260,14 @@ class StatusIndicatorFactory : private ThreadHelpBase
         virtual void SAL_CALL setValue(const css::uno::Reference< css::task::XStatusIndicator >& xChild,
                                              sal_Int32                                           nValue);
 
-    //-------------------------------------------
+
     // specials
 
     protected:
 
         virtual ~StatusIndicatorFactory();
 
-    //-------------------------------------------
+
     // helper
     private:
 
diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx
index 0c92ef0086d4..8966a89a88ad 100644
--- a/framework/inc/helper/tagwindowasmodified.hxx
+++ b/framework/inc/helper/tagwindowasmodified.hxx
@@ -36,7 +36,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          listen for modify events on model and tag frame container window so it can react accordingly
     @descr          Used e.g. by our MAC port where such state is shown separately on some controls of the
                     title bar.
@@ -58,7 +58,7 @@ class TagWindowAsModified :   // baseclasses (order necessary for right initiali
                                           css::frame::XFrameActionListener, // => XEventListener
                                           css::util::XModifyListener >       // => XEventListener
 {
-    //________________________________
+
     // member
 
     private:
@@ -72,43 +72,43 @@ class TagWindowAsModified :   // baseclasses (order necessary for right initiali
         /// we list on the model for modify events
         css::uno::WeakReference< css::frame::XModel > m_xModel;
 
-    //________________________________
+
     // interface
 
     public:
 
-        //____________________________
+
         // ctor/dtor
                  TagWindowAsModified();
         virtual ~TagWindowAsModified(                                                                   );
 
-        //____________________________
+
         // XInterface, XTypeProvider
 
-        //____________________________
+
         // XInitialization
         virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
             throw(css::uno::Exception       ,
                   css::uno::RuntimeException, std::exception);
 
-        //____________________________
+
         // XModifyListener
         virtual void SAL_CALL modified(const css::lang::EventObject& aEvent)
             throw(css::uno::RuntimeException, std::exception);
 
-        //____________________________
+
         // XFrameActionListener
         virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent)
             throw(css::uno::RuntimeException, std::exception);
 
-        //____________________________
+
         // XEventListener
         virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
             throw(css::uno::RuntimeException, std::exception);
 
     private:
 
-        //____________________________
+
         // @todo document me
         void impl_update(const css::uno::Reference< css::frame::XFrame >& xFrame);
 
diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx
index bfc0dbf6101d..75e01193b697 100644
--- a/framework/inc/helper/titlebarupdate.hxx
+++ b/framework/inc/helper/titlebarupdate.hxx
@@ -37,7 +37,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          helps our frame on setting title/icon on the titlebar (including updates)
 
     @devstatus      draft
@@ -51,7 +51,7 @@ class TitleBarUpdate : // baseclasses (order necessary for right initialization!
                                  , css::frame::XTitleChangeListener // => XEventListener
                                  , css::frame::XFrameActionListener > // => XEventListener
 {
-    //________________________________
+
     // structs, types
 
     private:
@@ -66,7 +66,7 @@ class TitleBarUpdate : // baseclasses (order necessary for right initialization!
             ::sal_Int32 nIcon;
         };
 
-    //________________________________
+
     // member
 
     private:
@@ -77,46 +77,46 @@ class TitleBarUpdate : // baseclasses (order necessary for right initialization!
         /// reference to the frame which was created by the office himself
         css::uno::WeakReference< css::frame::XFrame > m_xFrame;
 
-    //________________________________
+
     // interface
 
     public:
 
-        //____________________________
+
         // ctor/dtor
                  TitleBarUpdate(const css::uno::Reference< css::uno::XComponentContext >& xContext);
         virtual ~TitleBarUpdate(                                                                   );
 
-        //____________________________
+
         // XInterface, XTypeProvider
 
-        //____________________________
+
         // XInitialization
         virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
             throw(css::uno::Exception       ,
                   css::uno::RuntimeException, std::exception);
 
-        //____________________________
+
         // XFrameActionListener
         virtual void SAL_CALL frameAction(const css::frame::FrameActionEvent& aEvent)
             throw(css::uno::RuntimeException, std::exception);
 
-        //____________________________
+
         // XTitleChangeListener
         virtual void SAL_CALL titleChanged(const css::frame::TitleChangedEvent& aEvent)
             throw (css::uno::RuntimeException, std::exception);
 
-        //____________________________
+
         // XEventListener
         virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
             throw(css::uno::RuntimeException, std::exception);
 
-    //________________________________
+
     // helper
 
     private:
 
-        //____________________________
+
         /** @short  identify the application module, which  is used behind the component
                     of our frame.
 
@@ -134,7 +134,7 @@ class TitleBarUpdate : // baseclasses (order necessary for right initialization!
         ::sal_Bool implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame,
                                               TModuleInfo&                               rInfo );
 
-        //____________________________
+
         /** @short  set a new icon and title on the title bar of our connected frame window.
 
             @descr  It does not check if an update is really needed. That has to be done outside.
@@ -143,7 +143,7 @@ class TitleBarUpdate : // baseclasses (order necessary for right initialization!
          */
         void impl_forceUpdate();
 
-        //____________________________
+
         /** @short  identify the current component (inside the connected frame)
                     and set the right module icon on the title bar.
 
@@ -153,7 +153,7 @@ class TitleBarUpdate : // baseclasses (order necessary for right initialization!
          */
         void impl_updateIcon(const css::uno::Reference< css::frame::XFrame >& xFrame);
 
-        //____________________________
+
         /** @short  gets the current title from the frame and set it on the window.
 
             @param  xFrame
diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx
index 60b4594da468..3f1a360b3e14 100644
--- a/framework/inc/helper/uiconfigelementwrapperbase.hxx
+++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx
@@ -55,9 +55,9 @@ class UIConfigElementWrapperBase : protected ThreadHelpBase
                                    public ::cppu::OPropertySetHelper                             ,
                                    public UIConfigElementWrapperBase_BASE
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
         UIConfigElementWrapperBase( sal_Int16 nType );
         virtual  ~UIConfigElementWrapperBase();
@@ -103,9 +103,9 @@ class UIConfigElementWrapperBase : protected ThreadHelpBase
         using cppu::OPropertySetHelper::disposing;
         virtual  void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw(::com::sun::star::uno::RuntimeException, std::exception);
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  protected methods
-    //-------------------------------------------------------------------------------------------------------------
+
     protected:
 
         //  OPropertySetHelper
diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx
index ab91b1c3e5bb..649a21f4dc03 100644
--- a/framework/inc/helper/uielementwrapperbase.hxx
+++ b/framework/inc/helper/uielementwrapperbase.hxx
@@ -49,9 +49,9 @@ class UIElementWrapperBase : protected ThreadHelpBase
                              public ::cppu::OPropertySetHelper                  ,
                              public UIElementWrapperBase_BASE
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
          UIElementWrapperBase( sal_Int16 nType );
         virtual  ~UIElementWrapperBase();
@@ -83,9 +83,9 @@ class UIElementWrapperBase : protected ThreadHelpBase
         virtual  ::sal_Int16 SAL_CALL getType() throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual  ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception) = 0;
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  protected methods
-    //-------------------------------------------------------------------------------------------------------------
+
     protected:
 
         //  OPropertySetHelper
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx
index 1fdc17a85f43..650c8e6a4fb6 100644
--- a/framework/inc/helper/vclstatusindicator.hxx
+++ b/framework/inc/helper/vclstatusindicator.hxx
@@ -35,13 +35,13 @@
 
 namespace framework {
 
-//-----------------------------------------------
+
 // declaration
 
 class VCLStatusIndicator : private ThreadHelpBase, // must be the first real base class!
                            public  ::cppu::WeakImplHelper1< css::task::XStatusIndicator >
 {
-    //-------------------------------------------
+
     // member
 
     private:
@@ -67,7 +67,7 @@ class VCLStatusIndicator : private ThreadHelpBase, // must be the first real bas
         /** knows the current value of the progress. */
         sal_Int32 m_nValue;
 
-    //-------------------------------------------
+
     // interface
 
     public:
@@ -95,7 +95,7 @@ class VCLStatusIndicator : private ThreadHelpBase, // must be the first real bas
         virtual void SAL_CALL setValue(sal_Int32 nValue)
             throw(css::uno::RuntimeException, std::exception);
 
-    //-------------------------------------------
+
     // helper
 
     private:
diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx
index 846b67b41a29..4c46bebbe67c 100644
--- a/framework/inc/helper/wakeupthread.hxx
+++ b/framework/inc/helper/wakeupthread.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX
 #define INCLUDED_FRAMEWORK_INC_HELPER_WAKEUPTHREAD_HXX
 
-//_______________________________________________
+
 // include files of own module
 
 #include <threadhelp/threadhelpbase.hxx>
@@ -28,12 +28,12 @@
 
 #include <general.h>
 
-//_______________________________________________
+
 // include UNO interfaces
 
 #include <com/sun/star/util/XUpdatable.hpp>
 
-//_______________________________________________
+
 // include all others
 #include <cppuhelper/weakref.hxx>
 #include <osl/thread.hxx>
@@ -42,13 +42,13 @@
 namespace framework{
 
 
-//===============================================
+
 /** @short  implements a "sleeping" thread, which try to sleep
             without a using cpu consumption :-) */
 class WakeUpThread : public ThreadHelpBase
                    , public ::osl::Thread
 {
-    //-------------------------------------------
+
     // member
     private:
 
@@ -56,7 +56,7 @@ class WakeUpThread : public ThreadHelpBase
                     waked up. */
         css::uno::WeakReference< css::util::XUpdatable > m_xListener;
 
-    //-------------------------------------------
+
     // interface
     public:
 
diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx
index b50b90fce508..de0ee8a6d774 100644
--- a/framework/inc/jobs/configaccess.hxx
+++ b/framework/inc/jobs/configaccess.hxx
@@ -32,7 +32,7 @@
 namespace framework{
 
 
-//_______________________________________
+
 /**
     @short  implements a simple configuration access
     @descr  Sometimes it's better to have direct config access
@@ -56,7 +56,7 @@ class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase
             E_READWRITE
         };
 
-    //___________________________________
+
     // member
 
     private:
@@ -76,7 +76,7 @@ class FWI_DLLPUBLIC ConfigAccess : public ThreadHelpBase
         /** represent the current open mode */
         EOpenMode m_eMode;
 
-    //___________________________________
+
     // native interface methods
 
     public:
diff --git a/framework/inc/jobs/helponstartup.hxx b/framework/inc/jobs/helponstartup.hxx
index dfbd1e86f3eb..e30d1a4ce914 100644
--- a/framework/inc/jobs/helponstartup.hxx
+++ b/framework/inc/jobs/helponstartup.hxx
@@ -38,7 +38,7 @@
 namespace framework{
 
 
-//_______________________________________________
+
 /** @short  implements a job component, which handle the special
             feature to show a suitable help page for every (visible!)
             loaded document.
@@ -48,43 +48,43 @@ namespace framework{
 class HelpOnStartup : private ThreadHelpBase
                       ,public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo,::com::sun::star::lang::XEventListener,::com::sun::star::task::XJob >
 {
-    //-------------------------------------------
+
     // member
     private:
 
-        //.......................................
+
         /** @short  reference to an uno service manager. */
         css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
-        //.......................................
+
         /** @short  such module manager is used to classify new opened documents. */
         css::uno::Reference< css::frame::XModuleManager2 > m_xModuleManager;
 
-        //.......................................
+
         /** @short  is needed to locate a might open help frame. */
         css::uno::Reference< css::frame::XDesktop2 > m_xDesktop;
 
-        //.......................................
+
         /** @short  provides read access to the underlying configuration. */
         css::uno::Reference< css::container::XNameAccess > m_xConfig;
 
-        //.......................................
+
         /** @short  knows the current locale of this office session,
                     which is needed to build complete help URLs.
          */
         OUString m_sLocale;
 
-        //.......................................
+
         /** @short  knows the current operating system of this office session,
                     which is needed to build complete help URLs.
          */
         OUString m_sSystem;
 
-    //-------------------------------------------
+
     // native interface
     public:
 
-        //---------------------------------------
+
         /** @short  create new instance of this class.
 
             @param  xContext
@@ -93,7 +93,7 @@ class HelpOnStartup : private ThreadHelpBase
          */
         HelpOnStartup(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
-        //---------------------------------------
+
         /** @short  does nothing real ...
 
             @descr  But it should exists as virtual function,
@@ -102,11 +102,11 @@ class HelpOnStartup : private ThreadHelpBase
          */
         virtual ~HelpOnStartup();
 
-    //-------------------------------------------
+
     // uno interface
     public:
 
-        //---------------------------------------
+
         // css.lang.XServiceInfo
         DECLARE_XSERVICEINFO
 
@@ -120,11 +120,11 @@ class HelpOnStartup : private ThreadHelpBase
         virtual void SAL_CALL disposing(const css::lang::EventObject& aEvent)
             throw(css::uno::RuntimeException, std::exception);
 
-    //-------------------------------------------
+
     // helper
     private:
 
-        //---------------------------------------
+
         /** @short  analyze the given job arguments, try to locate a model reference
                     and try to classify this model.
 
@@ -140,7 +140,7 @@ class HelpOnStartup : private ThreadHelpBase
          */
         OUString its_getModuleIdFromEnv(const css::uno::Sequence< css::beans::NamedValue >& lArguments);
 
-        //---------------------------------------
+
         /** @short  tries to locate the open help module and return
                     the url of the currently shown help content.
 
@@ -152,7 +152,7 @@ class HelpOnStartup : private ThreadHelpBase
          */
         OUString its_getCurrentHelpURL();
 
-        //---------------------------------------
+
         /** @short  checks if the given help url match to a default help url
                     of any office module.
 
@@ -165,7 +165,7 @@ class HelpOnStartup : private ThreadHelpBase
          */
         ::sal_Bool its_isHelpUrlADefaultOne(const OUString& sHelpURL);
 
-        //---------------------------------------
+
         /** @short  checks, if the help module should be shown automaticly for the
                     currently opened office module.
 
@@ -182,7 +182,7 @@ class HelpOnStartup : private ThreadHelpBase
          */
         OUString its_checkIfHelpEnabledAndGetURL(const OUString& sModule);
 
-        //---------------------------------------
+
         /** @short  create a help URL for the given parameters.
 
             @param  sBaseURL
diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx
index 1f4c504a28a9..d0c423ded10e 100644
--- a/framework/inc/jobs/job.hxx
+++ b/framework/inc/jobs/job.hxx
@@ -59,7 +59,7 @@ class Job : private ThreadHelpBase
                       , css::frame::XTerminateListener
                       , css::util::XCloseListener >
 {
-    //___________________________________
+
     // structs
 
     private:
@@ -76,7 +76,7 @@ class Job : private ThreadHelpBase
         E_DISPOSED
     };
 
-    //___________________________________
+
     // member
 
     private:
@@ -169,7 +169,7 @@ class Job : private ThreadHelpBase
          */
         ERunState m_eRunState;
 
-    //___________________________________
+
     // native interface
 
     public:
@@ -193,7 +193,7 @@ class Job : private ThreadHelpBase
         void                                         impl_startListening   (                                                                  );
         void                                         impl_stopListening    (                                                                  );
 
-    //___________________________________
+
     // uno interface
 
     public:
diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx
index aa8332de3b62..0b3b302a2e4f 100644
--- a/framework/inc/jobs/jobconst.hxx
+++ b/framework/inc/jobs/jobconst.hxx
@@ -31,7 +31,7 @@
 namespace framework{
 
 
-//_______________________________________
+
 /**
     @short  defines all constant values used within a job environment.
 
diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx
index 2acc493a907d..201334079f9d 100644
--- a/framework/inc/jobs/jobdata.hxx
+++ b/framework/inc/jobs/jobdata.hxx
@@ -102,7 +102,7 @@ class JobData : private ThreadHelpBase
             {}
         };
 
-    //___________________________________
+
     // member
 
     private:
@@ -179,7 +179,7 @@ class JobData : private ThreadHelpBase
          */
         JobResult m_aLastExecutionResult;
 
-    //___________________________________
+
     // native interface
 
     public:
@@ -217,7 +217,7 @@ class JobData : private ThreadHelpBase
                                                const OUString&                                                 sEvent ,
                                                      ::comphelper::SequenceAsVector< JobData::TJob2DocEventBinding >& lJobs  );
 
-    //___________________________________
+
     // private helper
 
     private:
diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx
index 4d24d4ec1a71..d1d190209659 100644
--- a/framework/inc/jobs/jobresult.hxx
+++ b/framework/inc/jobs/jobresult.hxx
@@ -33,7 +33,7 @@
 namespace framework{
 
 
-//_______________________________________
+
 /**
     @short  represent a result of a finished job execution
     @descr  Such result instance transport all neccessarry
@@ -42,7 +42,7 @@ namespace framework{
  */
 class JobResult : private ThreadHelpBase
 {
-    //___________________________________
+
     // types
 
     public:
@@ -63,7 +63,7 @@ class JobResult : private ThreadHelpBase
             E_DISPATCHRESULT    =   4
         };
 
-    //___________________________________
+
     // member
 
     private:
@@ -105,7 +105,7 @@ class JobResult : private ThreadHelpBase
          */
         css::frame::DispatchResultEvent m_aDispatchResult;
 
-    //___________________________________
+
     // native interface
 
     public:
diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx
index 2839280d721e..3f80c4a0be15 100644
--- a/framework/inc/jobs/joburl.hxx
+++ b/framework/inc/jobs/joburl.hxx
@@ -45,7 +45,7 @@ namespace framework{
 #define JOBURL_PART_SEPARATOR      ';'
 #define JOBURL_PARTARGS_SEPARATOR  ','
 
-//_______________________________________
+
 /**
     @short  can be used to parse, validate and work with job URL's
     @descr  Job URLs are specified by the following syntax:
@@ -55,7 +55,7 @@ namespace framework{
  */
 class JobURL : private ThreadHelpBase
 {
-    //___________________________________
+
     // types
 
     private:
@@ -77,7 +77,7 @@ class JobURL : private ThreadHelpBase
             E_SERVICE = 4
         };
 
-    //___________________________________
+
     // types
 
     private:
@@ -103,7 +103,7 @@ class JobURL : private ThreadHelpBase
         /** holds the service arguments */
         OUString m_sServiceArgs;
 
-    //___________________________________
+
     // native interface
 
     public:
@@ -114,7 +114,7 @@ class JobURL : private ThreadHelpBase
         sal_Bool getAlias      (       OUString& sAlias       ) const;
         sal_Bool getService    (       OUString& sService     ) const;
 
-    //___________________________________
+
     // private helper
 
     private:
@@ -125,7 +125,7 @@ class JobURL : private ThreadHelpBase
                                             OUString& rPartValue      ,
                                             OUString& rPartArguments  );
 
-    //___________________________________
+
     // debug methods!
 
     #ifdef ENABLE_COMPONENT_SELF_CHECK
diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx
index 12a99eb663f3..8d051ffe897b 100644
--- a/framework/inc/jobs/shelljob.hxx
+++ b/framework/inc/jobs/shelljob.hxx
@@ -37,7 +37,7 @@
 namespace framework{
 
 
-//_______________________________________________
+
 /** @short  implements a job component which can be used
             to execute system shell commands.
 
@@ -52,19 +52,19 @@ namespace framework{
 class ShellJob : private ThreadHelpBase
                ,public ::cppu::WeakImplHelper2< ::com::sun::star::lang::XServiceInfo,::com::sun::star::task::XJob >
 {
-    //-------------------------------------------
+
     // member
     private:
 
-        //.......................................
+
         /** @short  reference to an uno service manager. */
         css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
-    //-------------------------------------------
+
     // native interface
     public:
 
-        //---------------------------------------
+
         /** @short  create new instance of this class.
 
             @param  xContext
@@ -73,7 +73,7 @@ class ShellJob : private ThreadHelpBase
          */
         ShellJob(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
-        //---------------------------------------
+
         /** @short  does nothing real ...
 
             @descr  But it should exists as virtual function,
@@ -82,11 +82,11 @@ class ShellJob : private ThreadHelpBase
          */
         virtual ~ShellJob();
 
-    //-------------------------------------------
+
     // uno interface
     public:
 
-        //---------------------------------------
+
         // css.lang.XServiceInfo
         DECLARE_XSERVICEINFO
 
@@ -96,11 +96,11 @@ class ShellJob : private ThreadHelpBase
                   css::uno::Exception                ,
                   css::uno::RuntimeException, std::exception         );
 
-    //-------------------------------------------
+
     // helper
     private:
 
-        //---------------------------------------
+
         /** generate a return value for method execute()
             which will force deactivation of this job for further requests.
 
@@ -108,7 +108,7 @@ class ShellJob : private ThreadHelpBase
          */
         static css::uno::Any impl_generateAnswer4Deactivation();
 
-        //---------------------------------------
+
         /** substitute all might existing placeholder variables
             within the configured command.
 
@@ -124,7 +124,7 @@ class ShellJob : private ThreadHelpBase
          */
         OUString impl_substituteCommandVariables(const OUString& sCommand);
 
-        //---------------------------------------
+
         /** executes the command.
 
             @param  sCommand
diff --git a/framework/inc/macros/generic.hxx b/framework/inc/macros/generic.hxx
index c313783bcadc..ee99f0ed834b 100644
--- a/framework/inc/macros/generic.hxx
+++ b/framework/inc/macros/generic.hxx
@@ -23,9 +23,9 @@
 #include <rtl/ustring.hxx>
 #include <rtl/textenc.h>
 
-//*****************************************************************************************************************
+
 //  generic macros
-//*****************************************************************************************************************
+
 
 /*_________________________________________________________________________________________________________________
     DECLARE_ASCII( SASCIIVALUE )
diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx
index db2b95cb5ccb..2dff57de9543 100644
--- a/framework/inc/macros/registration.hxx
+++ b/framework/inc/macros/registration.hxx
@@ -36,10 +36,10 @@
 
 _________________________________________________________________________________________________________________*/
 
-//*****************************************************************************************************************
+
 //  public
 //  use it as parameter for COMPONENT_GETFACTORY( IFFACTORIES )
-//*****************************************************************************************************************
+
 #define IFFACTORY( CLASS )                                                                                                              \
     /* If searched name found ... */                                                                                                    \
     /* You can't add some statements before follow line ... Here can be an ELSE-statement! */                                           \
@@ -50,10 +50,10 @@ ________________________________________________________________________________
         xFactory = CLASS::impl_createFactory( xServiceManager );                                                                        \
     }
 
-//*****************************************************************************************************************
+
 //  public
 //  define method to instanciate new services
-//*****************************************************************************************************************
+
 #define COMPONENTGETFACTORY( LIB, IFFACTORIES )                                                                                         \
     extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL LIB##_component_getFactory( const sal_Char* pImplementationName,                      \
                                                             void*       pServiceManager     ,                                           \
diff --git a/framework/inc/macros/xinterface.hxx b/framework/inc/macros/xinterface.hxx
index b7cabea59c79..8c245d0dbd49 100644
--- a/framework/inc/macros/xinterface.hxx
+++ b/framework/inc/macros/xinterface.hxx
@@ -45,11 +45,11 @@ namespace framework{
 
 _________________________________________________________________________________________________________________*/
 
-//*****************************************************************************************************************
+
 //  private
 //  implementation of   XInterface::aquire()
 //                      XInterface::release()
-//*****************************************************************************************************************
+
 #define PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS )                                                                                        \
     void SAL_CALL CLASS::acquire() throw()                                                                          \
     {                                                                                                                                                       \
@@ -63,10 +63,10 @@ ________________________________________________________________________________
         BASECLASS::release();                                                                                                                               \
     }
 
-//*****************************************************************************************************************
+
 //  private
 //  implementation of XInterface::queryInterface() without any other interfaces!
-//*****************************************************************************************************************
+
 #define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_PURE( CLASS, BASECLASS )                                                                                   \
     ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException )  \
     {                                                                                                                                                       \
@@ -76,10 +76,10 @@ ________________________________________________________________________________
         return BASECLASS::queryInterface( aType );                                                                                                          \
     }
 
-//*****************************************************************************************************************
+
 //  private
 //  implementation of XInterface::queryInterface() with max. 12 other interfaces!
-//*****************************************************************************************************************
+
 #define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE( CLASS, BASECLASS, INTERFACES )                                                                            \
     ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception )  \
     {                                                                                                                                                       \
@@ -97,10 +97,10 @@ ________________________________________________________________________________
         return aReturn;                                                                                                                                     \
     }
 
-//*****************************************************************************************************************
+
 //  private
 //  implementation of XInterface::queryInterface() with more then 12 other interfaces!
-//*****************************************************************************************************************
+
 #define PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND )                                             \
     ::com::sun::star::uno::Any SAL_CALL CLASS::queryInterface( const ::com::sun::star::uno::Type& aType ) throw( ::com::sun::star::uno::RuntimeException, std::exception )  \
     {                                                                                                                                                       \
@@ -124,10 +124,10 @@ ________________________________________________________________________________
         return aReturn;                                                                                                                                     \
     }
 
-//*****************************************************************************************************************
+
 //  private
 //  complete implementation of XInterface for different use cases
-//*****************************************************************************************************************
+
 #define PRIVATE_DEFINE_XINTERFACE_PURE( CLASS, BASECLASS )                                                                                                  \
     PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS )                                                                                            \
     PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_PURE( CLASS, BASECLASS )
@@ -140,10 +140,10 @@ ________________________________________________________________________________
     PRIVATE_DEFINE_XINTERFACE_AQUIRE_RELEASE( CLASS, BASECLASS )                                                                                            \
     PRIVATE_DEFINE_XINTERFACE_QUERYINTERFACE_LARGE( CLASS, BASECLASS, INTERFACES_FIRST, INTERFACES_SECOND )
 
-//*****************************************************************************************************************
+
 //  private
 //  help macros to replace INTERFACES in queryInterface() [see before]
-//*****************************************************************************************************************
+
 /*
 #ifdef ENABLE_SERVICEDEBUG
     #define PRIVATE_DEFINE_INTERFACE_1( INTERFACE1 )     \
@@ -195,10 +195,10 @@ ________________________________________________________________________________
     PRIVATE_DEFINE_INTERFACE_10( INTERFACE1, INTERFACE2, INTERFACE3, INTERFACE4, INTERFACE5, INTERFACE6, INTERFACE7, INTERFACE8, INTERFACE9, INTERFACE10 ),                                             \
     INTERFACE11
 
-//*****************************************************************************************************************
+
 //  public
 //  help macros for follow XInterface definitions
-//*****************************************************************************************************************
+
 
 //  Use it as parameter for DEFINE_XINTERFACE_X(), if you CAN use an interface directly in queryInterface()!
 #define DIRECT_INTERFACE( INTERFACE ) \
@@ -209,19 +209,19 @@ ________________________________________________________________________________
 #define DERIVED_INTERFACE( BASEINTERFACE, DERIVEDINTERFACE ) \
     static_cast< BASEINTERFACE* >( static_cast< DERIVEDINTERFACE* >( this ) )
 
-//*****************************************************************************************************************
+
 //  public
 //  declaration of XInterface
-//*****************************************************************************************************************
+
 #define FWK_DECLARE_XINTERFACE                                                                                                                                      \
     virtual ::com::sun::star::uno::Any  SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType   ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); \
     virtual void                        SAL_CALL acquire       (                                            ) throw();  \
     virtual void                        SAL_CALL release       (                                            ) throw();
 
-//*****************************************************************************************************************
+
 //  public
 //  implementation of XInterface
-//*****************************************************************************************************************
+
 
 //  implementation of XInterface with 0 additional interface for queryInterface()
 #define DEFINE_XINTERFACE_0( CLASS, BASECLASS )                                                                     \
diff --git a/framework/inc/macros/xtypeprovider.hxx b/framework/inc/macros/xtypeprovider.hxx
index cdcbac5f5839..7854b2f6f1d0 100644
--- a/framework/inc/macros/xtypeprovider.hxx
+++ b/framework/inc/macros/xtypeprovider.hxx
@@ -49,10 +49,10 @@ namespace framework{
 
 _________________________________________________________________________________________________________________*/
 
-//*****************************************************************************************************************
+
 //  private
 //  implementation of XTypeProvider::getImplementationId()
-//*****************************************************************************************************************
+
 #define PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS )                                                                               \
     ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL CLASS::getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception )          \
     {                                                                                                                                           \
@@ -78,10 +78,10 @@ ________________________________________________________________________________
         return pID->getImplementationId();                                                                                                      \
     }
 
-//*****************************************************************************************************************
+
 //  private
 //  implementation of XTypeProvider::getTypes() with max. 12 interfaces!
-//*****************************************************************************************************************
+
 #define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, TYPES )                                                                                   \
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception )  \
     {                                                                                                                                           \
@@ -108,10 +108,10 @@ ________________________________________________________________________________
         return pTypeCollection->getTypes();                                                                                                     \
     }
 
-//*****************************************************************************************************************
+
 //  private
 //  implementation of XTypeProvider::getTypes() with more then 12 interfaces!
-//*****************************************************************************************************************
+
 #define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_LARGE( CLASS, TYPES_FIRST, TYPES_SECOND )                                                         \
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException, std::exception )  \
     {                                                                                                                                           \
@@ -160,10 +160,10 @@ ________________________________________________________________________________
         return *pTypeCollection;                                                                                                                \
     }
 
-//*****************************************************************************************************************
+
 //  private
 //  implementation of XTypeProvider::getTypes() with using max. 12 interfaces + baseclass!
-//*****************************************************************************************************************
+
 #define PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_BASECLASS( CLASS, BASECLASS, TYPES )                                                              \
     ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL CLASS::getTypes() throw( ::com::sun::star::uno::RuntimeException )  \
     {                                                                                                                                           \
@@ -211,10 +211,10 @@ ________________________________________________________________________________
         return *pTypeCollection;                                                                                                                \
     }
 
-//*****************************************************************************************************************
+
 //  private
 //  help macros to replace TYPES in getTypes() [see before]
-//*****************************************************************************************************************
+
 #define PRIVATE_DEFINE_TYPE_1( TYPE1 )                                                                                                          \
     ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE1 >*)NULL )
 
@@ -262,10 +262,10 @@ ________________________________________________________________________________
     PRIVATE_DEFINE_TYPE_11( TYPE1, TYPE2, TYPE3, TYPE4, TYPE5, TYPE6, TYPE7, TYPE8, TYPE9, TYPE10, TYPE11 ),                                    \
     ::getCppuType(( const ::com::sun::star::uno::Reference< TYPE12 >*)NULL )
 
-//*****************************************************************************************************************
+
 //  private
 //  complete implementation of XTypeProvider
-//*****************************************************************************************************************
+
 #define PRIVATE_DEFINE_XTYPEPROVIDER_PURE( CLASS )                                                                                                          \
     PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS )                                                                                               \
     PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES( CLASS, ::getCppuType(( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider >*)NULL ) )
@@ -282,18 +282,18 @@ ________________________________________________________________________________
     PRIVATE_DEFINE_XTYPEPROVIDER_GETIMPLEMENTATIONID( CLASS )                                                                                               \
     PRIVATE_DEFINE_XTYPEPROVIDER_GETTYPES_BASECLASS( CLASS, BASECLASS, TYPES )
 
-//*****************************************************************************************************************
+
 //  public
 //  declaration of XTypeProvider
-//*****************************************************************************************************************
+
 #define FWK_DECLARE_XTYPEPROVIDER                                                                                                                               \
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes           () throw( ::com::sun::star::uno::RuntimeException, std::exception );\
     virtual ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
-//*****************************************************************************************************************
+
 //  public
 //  implementation of XTypeProvider
-//*****************************************************************************************************************
+
 //  implementation of XTypeProvider without additional interface for getTypes()
 //  XTypeProvider is used as the only one interface automaticly.
 //  Following defines don't use XTypeProvider automaticly!!!!
diff --git a/framework/inc/properties.h b/framework/inc/properties.h
index f38420c6f5aa..22c74b2e8b64 100644
--- a/framework/inc/properties.h
+++ b/framework/inc/properties.h
@@ -26,7 +26,7 @@
 
 namespace framework{
 
-//_______________________________________________
+
 /** properties for "Frame" class */
 
 #define FRAME_PROPNAME_ASCII_DISPATCHRECORDERSUPPLIER   "DispatchRecorderSupplier"
@@ -52,7 +52,7 @@ namespace framework{
 
 #define FRAME_PROPCOUNT                                 5
 
-//_______________________________________________
+
 /** properties for "Desktop" class */
 
 #define DESKTOP_PROPNAME_ASCII_ACTIVEFRAME              "ActiveFrame"
@@ -78,7 +78,7 @@ namespace framework{
 
 #define DESKTOP_PROPCOUNT                               5
 
-//_______________________________________________
+
 /** properties for "PathSettings" class */
 
 #define PATHSETTINGS_PROPNAME_ASCII_ADDIN               "Addin"
@@ -161,7 +161,7 @@ namespace framework{
 
 #define PATHSETTINGS_PROPCOUNT                          24
 
-//_______________________________________________
+
 /** properties for "LayoutManager" class */
 
 #define LAYOUTMANAGER_PROPNAME_ASCII_MENUBARCLOSER          "MenuBarCloser"
@@ -185,7 +185,7 @@ namespace framework{
 #define LAYOUTMANAGER_PROPHANDLE_LOCKCOUNT              4
 #define LAYOUTMANAGER_PROPHANDLE_PRESERVE_CONTENT_SIZE  5
 
-//_______________________________________________
+
 /** properties for "UICommandDescription" class */
 #define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDIMAGELIST        "private:resource/image/commandimagelist"
 #define UICOMMANDDESCRIPTION_NAMEACCESS_COMMANDROTATEIMAGELIST  "private:resource/image/commandrotateimagelist"
@@ -199,7 +199,7 @@ namespace framework{
 #define UICOMMANDDESCRIPTION_PROPERTIES_IMAGE_ROTATED           4
 #define UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON            8
 
-//_______________________________________________
+
 /** properties for "AutoRecovery" class */
 
 #define AUTORECOVERY_PROPNAME_ASCII_EXISTS_RECOVERYDATA "ExistsRecoveryData"
@@ -216,14 +216,14 @@ namespace framework{
 
 #define AUTORECOVERY_PROPCOUNT                          3
 
-//_______________________________________________
+
 /** properties for Filter config */
 
 #define FILTER_PROPNAME_ASCII_DOCUMENTSERVICE           "DocumentService"
 
 #define FILTER_PROPNAME_DOCUMENTSERVICE                 OUString( FILTER_PROPNAME_ASCII_DOCUMENTSERVICE )
 
-//_______________________________________________
+
 /** properties for office module config (Setup.xcu) */
 
 #define OFFICEFACTORY_PROPNAME_ASCII_WINDOWATTRIBUTES   "ooSetupFactoryWindowAttributes"
@@ -234,7 +234,7 @@ namespace framework{
 #define OFFICEFACTORY_PROPNAME_UINAME                   OUString( OFFICEFACTORY_PROPNAME_ASCII_UINAME )
 #define OFFICEFACTORY_PROPNAME_ICON                     OUString( OFFICEFACTORY_PROPNAME_ASCII_ICON )
 
-//_______________________________________________
+
 /** properties for tab window (old) */
 #define TABWINDOW_PROPNAME_ASCII_PARENTWINDOW           "ParentWindow"
 #define TABWINDOW_PROPNAME_ASCII_TOPWINDOW              "TopWindow"
@@ -248,14 +248,14 @@ namespace framework{
 #define TABWINDOWSERVICE_PROPHANDLE_WINDOW              0
 #define TABWINDOWSERVICE_PROPCOUNT                      1
 
-//_______________________________________________
+
 /** provides some helper methods to implement property sets. */
 
 class PropHelper
 {
     public:
 
-    //___________________________________________
+
 
     /** checks if given property will be changed by this settings.
      *  We compare the content of the given any values. If they are different we return sal_True - sal_False otherwise.
diff --git a/framework/inc/protocols.h b/framework/inc/protocols.h
index fd277de4963d..197dd8db9160 100644
--- a/framework/inc/protocols.h
+++ b/framework/inc/protocols.h
@@ -26,7 +26,7 @@
 
 namespace framework{
 
-//_______________________________________________________________________
+
 /**
     some protocols must be checked during loading or dispatching URLs manually
     It can be necessary to decide, if a URL represent a non visible content or
@@ -58,7 +58,7 @@ class ProtocolCheck
 {
     public:
 
-    //_______________________________________________________________________
+
     /**
         enums for well known protocols
      */
@@ -77,7 +77,7 @@ class ProtocolCheck
         E_NEWS
     };
 
-    //_______________________________________________________________________
+
     /**
         it checks, if the given URL string match one of the well known protocols.
         It returns the right enum value.
@@ -120,7 +120,7 @@ class ProtocolCheck
             return E_UNKNOWN_PROTOCOL;
     }
 
-    //_______________________________________________________________________
+
     /**
         it checks if given URL match the required protocol only
         It should be used instead of specifyProtocol() if only this question
diff --git a/framework/inc/queries.h b/framework/inc/queries.h
index 2a4e09632af1..6dc16be91c64 100644
--- a/framework/inc/queries.h
+++ b/framework/inc/queries.h
@@ -28,7 +28,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          These values describe our supported queries for type, filter ... properties.
                     They are used by our FilterFactory or ouer TypeDetection to return
                     subsets of our cached configuration.
@@ -44,7 +44,7 @@ namespace framework{
 #define BASE_QUERY_MATH                                 DECLARE_ASCII("_query_math"    )
 #define BASE_QUERY_GRAPHICS                             DECLARE_ASCII("_query_graphics")
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          These parameters can be used in combination with BASE_QUERY_... defines to
                     specialize it.
                     use follow syntax to do so:     "<query>[:<param>[=<value>]]"
@@ -75,23 +75,23 @@ namespace framework{
 #define QUERYPARAMVALUE_SORT_PROP_NAME                  DECLARE_ASCII("name"            )
 #define QUERYPARAMVALUE_SORT_PROP_UINAME                DECLARE_ASCII("uiname"          )
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          Helper class to support easy building of a query statements.
 *//*-*************************************************************************************************************/
 class QueryBuilder
 {
     public:
-        //---------------------------------------------------------------------------------------------------------
+
         // start with empty query
-        //---------------------------------------------------------------------------------------------------------
+
         QueryBuilder()
         {
             resetAll();
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // returns full query as copy of internal set values
-        //---------------------------------------------------------------------------------------------------------
+
         OUString getQuery()
         {
             OUStringBuffer sCopy( m_sParams );
@@ -99,17 +99,17 @@ class QueryBuilder
             return sCopy.makeStringAndClear();
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // set new or change existing base query part
-        //---------------------------------------------------------------------------------------------------------
+
         void setBase( const OUString& sBase )
         {
             m_sBase = sBase;
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // add new parameter (with optional value) to param list
-        //---------------------------------------------------------------------------------------------------------
+
         void addParam( const OUString& sParam, const OUString& sValue = OUString() )
         {
             m_sParams.append( SEPARATOR_QUERYPARAM );
@@ -121,19 +121,19 @@ class QueryBuilder
             }
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // forget all setted params and start with empty ones
         // Attention: base of query isn't changed!
-        //---------------------------------------------------------------------------------------------------------
+
         void resetParams()
         {
             m_sParams.makeStringAndClear();
             m_sParams.ensureCapacity( 256 );
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // start with new empty query
-        //---------------------------------------------------------------------------------------------------------
+
         void resetAll()
         {
             m_sBase = OUString();
@@ -146,18 +146,18 @@ class QueryBuilder
 
 };      // class QueryBuilder
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          Helper class to analyze queries and split into his different parts (base, params and values).
 *//*-*************************************************************************************************************/
 class QueryAnalyzer
 {
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         // it's will not perform to compare strings as query type ...
         // so we convert it into these enum values.
         // default = E_ALL!
-        //---------------------------------------------------------------------------------------------------------
+
         enum EQuery
         {
             E_ALL       ,
@@ -172,20 +172,20 @@ class QueryAnalyzer
             E_GRAPHICS
         };
 
-        //---------------------------------------------------------------------------------------------------------
+
         // these are valid values for param "sort_prop".
         // other ones are not supported!
         // default = E_NAME
-        //---------------------------------------------------------------------------------------------------------
+
         enum ESortProp
         {
             E_NAME      ,
             E_UINAME
         };
 
-        //---------------------------------------------------------------------------------------------------------
+
         // analyze given query and split it into his different parts; <base>:<param1>:<param2=value>...
-        //---------------------------------------------------------------------------------------------------------
+
         QueryAnalyzer(const OUString& sQuery)
             // Don't forget to set default values for non given params!
             :   m_eQuery        ( E_ALL      )   // return ALL filter ...
@@ -320,16 +320,16 @@ class QueryAnalyzer
             }
         }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // return type of query. User can decide then, which action should be started.
         // For faster work we converted query string into corresponding enum value!
-        //---------------------------------------------------------------------------------------------------------
+
         EQuery getQueryType() const { return m_eQuery; }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // access to additional parameter values
         // Methods return default of really set values!
-        //---------------------------------------------------------------------------------------------------------
+
         sal_uInt32 getIFlags       () const { return m_nIFlags       ; }
         sal_uInt32 getEFlags       () const { return m_nEFlags       ; }
         ESortProp  getSortProp     () const { return m_eSortProp     ; }
@@ -338,10 +338,10 @@ class QueryAnalyzer
         sal_Bool   getUseOrder     () const { return m_bUseOrder     ; }
         sal_Bool   getDefaultFirst () const { return m_bDefaultFirst ; }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // this method checks if given string match any supported query.
         // (ignore additional parameters!)
-        //---------------------------------------------------------------------------------------------------------
+
         static sal_Bool isQuery( const OUString& sQuery )
         {
             return(
diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx
index 494a2603e181..df0170719926 100644
--- a/framework/inc/recording/dispatchrecordersupplier.hxx
+++ b/framework/inc/recording/dispatchrecordersupplier.hxx
@@ -53,12 +53,12 @@ class DispatchRecorderSupplier  :   // baseclasses
                                                 css::lang::XServiceInfo             ,
                                                 css::frame::XDispatchRecorderSupplier >
 {
-    //___________________________________________
+
     // member
 
     private:
 
-        //_______________________________________
+
         /** provided dispatch recorder of this supplier instance
 
             @life   Is controled from outside. Because this variable is setted
@@ -67,17 +67,17 @@ class DispatchRecorderSupplier  :   // baseclasses
          */
         css::uno::Reference< css::frame::XDispatchRecorder > m_xDispatchRecorder;
 
-    //___________________________________________
+
     // uno interface
 
     public:
 
-        //_______________________________________
+
         // XInterface, XTypeProvider, XServiceInfo
 
         DECLARE_XSERVICEINFO
 
-        //_______________________________________
+
         // XDispatchRecorderSupplier
 
         virtual void                                                 SAL_CALL setDispatchRecorder( const css::uno::Reference< css::frame::XDispatchRecorder >& xRecorder   ) throw (css::uno::RuntimeException, std::exception);
@@ -86,7 +86,7 @@ class DispatchRecorderSupplier  :   // baseclasses
                                                                                                    const css::uno::Sequence< css::beans::PropertyValue >&      lArguments  ,
                                                                                                    const css::uno::Reference< css::frame::XDispatch >&         xDispatcher ) throw (css::uno::RuntimeException, std::exception);
 
-    //___________________________________________
+
     // native interface
 
     public:
diff --git a/framework/inc/services.h b/framework/inc/services.h
index 167d8ac61d22..c1cc2373873d 100644
--- a/framework/inc/services.h
+++ b/framework/inc/services.h
@@ -24,9 +24,9 @@
 
 namespace framework{
 
-//_________________________________________________________________________________________________________________
+
 //  used servicenames by framework
-//_________________________________________________________________________________________________________________
+
 
 #define SERVICENAME_FILTERFACTORY                               DECLARE_ASCII("com.sun.star.document.FilterFactory"                 )
 #define SERVICENAME_CFGUPDATEACCESS                             DECLARE_ASCII("com.sun.star.configuration.ConfigurationUpdateAccess")   // provides read/write access to the configuration
@@ -49,9 +49,9 @@ namespace framework{
 #define SERVICENAME_STRINGABBREVIATION                          DECLARE_ASCII("com.sun.star.util.UriAbbreviation"                   )
 #define SERVICENAME_TABWINDOWSERVICE                            DECLARE_ASCII("com.sun.star.ui.dialogs.TabContainerWindow"          )
 
-//_________________________________________________________________________________________________________________
+
 //  used implementationnames by framework
-//_________________________________________________________________________________________________________________
+
 
 #define IMPLEMENTATIONNAME_DESKTOP                              DECLARE_ASCII("com.sun.star.comp.framework.Desktop"                 )
 #define IMPLEMENTATIONNAME_URLTRANSFORMER                       DECLARE_ASCII("com.sun.star.comp.framework.URLTransformer"          )
diff --git a/framework/inc/services/contenthandlerfactory.hxx b/framework/inc/services/contenthandlerfactory.hxx
index 47a08754c36c..af94e0b83b86 100644
--- a/framework/inc/services/contenthandlerfactory.hxx
+++ b/framework/inc/services/contenthandlerfactory.hxx
@@ -45,7 +45,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      factory to create handler-objects
     @descr      These class can be used to create new handler for specified contents.
                 We use cached values of our configuration to lay down, which handler match
@@ -81,37 +81,37 @@ class ContentHandlerFactory :   // interfaces
                         private TransactionBase                     ,
                         public  ::cppu::OWeakObject
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
+
                  ContentHandlerFactory( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
         virtual ~ContentHandlerFactory(                                                                        );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XInterface, XTypeProvider, XServiceInfo
-        //---------------------------------------------------------------------------------------------------------
+
         DECLARE_XINTERFACE
         DECLARE_XTYPEPROVIDER
         DECLARE_XSERVICEINFO
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XMultiServiceFactory
-        //---------------------------------------------------------------------------------------------------------
+
         virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance             ( const OUString&                        sTypeName   ) throw( css::uno::Exception        ,
                                                                                                                                                                      css::uno::RuntimeException );
         virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString&                        sTypeName   ,
                                                                                                   const css::uno::Sequence< css::uno::Any >&    lArguments  ) throw( css::uno::Exception, css::uno::RuntimeException );
         virtual css::uno::Sequence< OUString >       SAL_CALL getAvailableServiceNames   (                                                           ) throw( css::uno::RuntimeException );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XNameContainer
-        //---------------------------------------------------------------------------------------------------------
+
         virtual void SAL_CALL insertByName( const OUString&  sHandlerName        ,
                                             const css::uno::Any&    aHandlerProperties  ) throw( css::lang::IllegalArgumentException     ,
                                                                                                  css::container::ElementExistException   ,
@@ -121,41 +121,41 @@ class ContentHandlerFactory :   // interfaces
                                                                                                  css::lang::WrappedTargetException       ,
                                                                                                  css::uno::RuntimeException              );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XNameReplace
-        //---------------------------------------------------------------------------------------------------------
+
         virtual void SAL_CALL replaceByName( const OUString& sHandlerName       ,
                                              const css::uno::Any&   aHandlerProperties ) throw( css::lang::IllegalArgumentException    ,
                                                                                                 css::container::NoSuchElementException ,
                                                                                                 css::lang::WrappedTargetException      ,
                                                                                                 css::uno::RuntimeException             );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XNameAccess
-        //---------------------------------------------------------------------------------------------------------
+
         virtual css::uno::Any                         SAL_CALL getByName      ( const OUString& sName ) throw( css::container::NoSuchElementException ,
                                                                                                                       css::lang::WrappedTargetException      ,
                                                                                                                       css::uno::RuntimeException             );
         virtual css::uno::Sequence< OUString > SAL_CALL getElementNames(                              ) throw( css::uno::RuntimeException             );
         virtual sal_Bool                              SAL_CALL hasByName      ( const OUString& sName ) throw( css::uno::RuntimeException             );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XElementAccess
-        //---------------------------------------------------------------------------------------------------------
+
         virtual css::uno::Type SAL_CALL getElementType() throw( css::uno::RuntimeException );
         virtual sal_Bool       SAL_CALL hasElements   () throw( css::uno::RuntimeException );
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XFlushable
-        //---------------------------------------------------------------------------------------------------------
+
         virtual void SAL_CALL flush              (                                                                   ) throw ( css::uno::RuntimeException );
         virtual void SAL_CALL addFlushListener   ( const css::uno::Reference< css::util::XFlushListener >& xListener ) throw ( css::uno::RuntimeException );
         virtual void SAL_CALL removeFlushListener( const css::uno::Reference< css::util::XFlushListener >& xListener ) throw ( css::uno::RuntimeException );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private variables
     //  (should be private everyway!)
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx
index 6cb114662f74..505f5fbddca2 100644
--- a/framework/inc/services/desktop.hxx
+++ b/framework/inc/services/desktop.hxx
@@ -63,7 +63,7 @@ enum ELoadState
     E_INTERACTION
 };
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      implement the topframe of frame tree
     @descr      This is the root of the frame tree. The desktop has no window, is not visible but he is the logical
                 "masternode" to build the hierarchy.
@@ -105,7 +105,7 @@ class Desktop : private osl::Mutex,
     // internal used types, const etcpp.
     private:
 
-        //---------------------------------------------------------------------
+
         /** used temporary to know which listener was already called or not. */
         typedef ::std::vector< css::uno::Reference< css::frame::XTerminateListener > > TTerminateListenerList;
 
@@ -138,7 +138,7 @@ class Desktop : private osl::Mutex,
         // XTypeProvider
         virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException, std::exception);
 
-        //---------------------------------------------------------------------
+
         /**
             @interface  XDesktop
 
@@ -170,7 +170,7 @@ class Desktop : private osl::Mutex,
         virtual ::sal_Bool SAL_CALL terminate()
             throw( css::uno::RuntimeException, std::exception );
 
-        //---------------------------------------------------------------------
+
         /**
             @interface  XDesktop
 
@@ -193,7 +193,7 @@ class Desktop : private osl::Mutex,
         virtual void SAL_CALL addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
             throw( css::uno::RuntimeException, std::exception );
 
-        //---------------------------------------------------------------------
+
         /**
             @interface  XDesktop
 
@@ -305,9 +305,9 @@ class Desktop : private osl::Mutex,
         // non-virtual and non-UNO for now
         bool SAL_CALL terminateQuickstarterToo()
             throw( css::uno::RuntimeException );
-    //-------------------------------------------------------------------------------------------------------------
+
     //  protected methods
-    //-------------------------------------------------------------------------------------------------------------
+
     protected:
 
         //  OPropertySetHelper
@@ -323,15 +323,15 @@ class Desktop : private osl::Mutex,
         virtual ::cppu::IPropertyArrayHelper&                       SAL_CALL getInfoHelper                   (                                       );
         virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo              (                                       ) throw (css::uno::RuntimeException, std::exception);
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         css::uno::Reference< css::lang::XComponent >            impl_getFrameComponent          ( const css::uno::Reference< css::frame::XFrame >&  xFrame          ) const;
         static const css::uno::Sequence< css::beans::Property > impl_getStaticPropertyDescriptor(                                                                   );
 
-        //---------------------------------------------------------------------
+
         /** calls queryTermination() on every registered termination listener.
          *
          *  Note: Only normal termination listener (registered in list m_aListenerContainer
@@ -352,7 +352,7 @@ class Desktop : private osl::Mutex,
         void impl_sendQueryTerminationEvent(TTerminateListenerList& lCalledListener,
                                             ::sal_Bool&             bVeto          );
 
-        //---------------------------------------------------------------------
+
         /** calls cancelTermination() on every termination listener
          *  where queryTermination() was called before.
          *
@@ -368,7 +368,7 @@ class Desktop : private osl::Mutex,
          */
         void impl_sendCancelTerminationEvent(const TTerminateListenerList& lCalledListener);
 
-        //---------------------------------------------------------------------
+
         /** calls notifyTermination() on every registered termination listener.
          *
          *  Note: Only normal termination listener (registered in list m_aListenerContainer
@@ -377,7 +377,7 @@ class Desktop : private osl::Mutex,
          */
         void impl_sendNotifyTerminationEvent();
 
-        //---------------------------------------------------------------------
+
         /** try to close all open frames.
          *
          *  Iterates over all child frames and try to close them.
@@ -395,10 +395,10 @@ class Desktop : private osl::Mutex,
          */
         ::sal_Bool impl_closeFrames(::sal_Bool bAllowUI);
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  debug methods
     //  (should be private everytime!)
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         static sal_Bool implcp_addEventListener         ( const css::uno::Reference< css::lang::XEventListener >&           xListener        );
@@ -407,10 +407,10 @@ class Desktop : private osl::Mutex,
         sal_Bool m_bIsTerminated ;  /// check flag to protect us against dispose before terminate!
                                     /// see dispose() for further information!
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  variables
     //  (should be private everytime!)
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         css::uno::Reference< css::uno::XComponentContext >              m_xContext                  ;   /// reference to factory, which has create this instance
@@ -427,13 +427,13 @@ class Desktop : private osl::Mutex,
         OUString                                                 m_sTitle                    ;
         css::uno::Reference< css::frame::XDispatchRecorderSupplier >    m_xDispatchRecorderSupplier ;
 
-        //---------------------------------------------------------------------
+
         /** special terminate listener to close pipe and block external requests
           * during/after termination process is/was running
           */
         css::uno::Reference< css::frame::XTerminateListener > m_xPipeTerminator;
 
-        //---------------------------------------------------------------------
+
         /** special terminate listener shown inside system tray (quick starter)
           * Will hinder the office on shutdown ... but wish to allow closing
           * of open documents. And because thats different to a normal terminate listener
@@ -441,7 +441,7 @@ class Desktop : private osl::Mutex,
           */
         css::uno::Reference< css::frame::XTerminateListener > m_xQuickLauncher;
 
-        //---------------------------------------------------------------------
+
         /** special terminate listener which loads images asynchronous for current open documents.
           * Because internally it uses blocking system APIs ... it cant be guaranteed that
           * running jobs can be cancelled successfully if the corressponding document will be closed ...
@@ -451,7 +451,7 @@ class Desktop : private osl::Mutex,
           */
         css::uno::Reference< css::frame::XTerminateListener > m_xSWThreadManager;
 
-        //---------------------------------------------------------------------
+
         /** special terminate listener shuting down the SfxApplication.
           * Because these desktop instance closes documents and informs listener
           * only ... it does not really shutdown the whole application.
diff --git a/framework/inc/services/dispatchhelper.hxx b/framework/inc/services/dispatchhelper.hxx
index 0aab05c12351..922848c3af1e 100644
--- a/framework/inc/services/dispatchhelper.hxx
+++ b/framework/inc/services/dispatchhelper.hxx
@@ -50,7 +50,7 @@ class DispatchHelper : public ThreadHelpBase                      // must be the
                       ,public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo,::com::sun::star::frame::XDispatchHelper,::com::sun::star::frame::XDispatchResultListener >
 {
 
-    //-------------------------------------------
+
     // member
 
     private:
@@ -66,23 +66,23 @@ class DispatchHelper : public ThreadHelpBase                      // must be the
 
         css::uno::Reference< css::uno::XInterface > m_xBroadcaster;
 
-    //-------------------------------------------
+
     // interface
 
     public:
 
-        //---------------------------------------
+
         // ctor/dtor
 
                  DispatchHelper( const css::uno::Reference< css::uno::XComponentContext >& xContext );
         virtual ~DispatchHelper(                                                                    );
 
-        //---------------------------------------
+
         // XInterface, XTypeProvider, XServiceInfo
 
         DECLARE_XSERVICEINFO
 
-        //---------------------------------------
+
         // XDispatchHelper
         virtual css::uno::Any SAL_CALL executeDispatch(
                                         const css::uno::Reference< css::frame::XDispatchProvider >& xDispatchProvider ,
@@ -92,13 +92,13 @@ class DispatchHelper : public ThreadHelpBase                      // must be the
                                         const css::uno::Sequence< css::beans::PropertyValue >&      lArguments        )
         throw(css::uno::RuntimeException, std::exception);
 
-        //---------------------------------------
+
         // XDispatchResultListener
         virtual void SAL_CALL dispatchFinished(
                                 const css::frame::DispatchResultEvent& aResult )
         throw(css::uno::RuntimeException, std::exception);
 
-        //---------------------------------------
+
         // XEventListener
         virtual void SAL_CALL disposing(
                                 const css::lang::EventObject& aEvent )
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx
index 08932cbf0dc5..db8be46e50f9 100644
--- a/framework/inc/services/layoutmanager.hxx
+++ b/framework/inc/services/layoutmanager.hxx
@@ -112,9 +112,8 @@ namespace framework
                 return aSeq;
             }
 
-            //---------------------------------------------------------------------------------------------------------
+
             // XLayoutManager
-            //---------------------------------------------------------------------------------------------------------
             virtual void SAL_CALL attachFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& Frame ) throw (::com::sun::star::uno::RuntimeException, std::exception);
             virtual void SAL_CALL reset() throw (::com::sun::star::uno::RuntimeException, std::exception);
             virtual ::com::sun::star::awt::Rectangle SAL_CALL getCurrentDockingArea(  ) throw (::com::sun::star::uno::RuntimeException, std::exception);
@@ -147,51 +146,42 @@ namespace framework
             virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw (::com::sun::star::uno::RuntimeException, std::exception);
             virtual sal_Bool SAL_CALL isVisible() throw (::com::sun::star::uno::RuntimeException, std::exception);
 
-            //---------------------------------------------------------------------------------------------------------
             // XMenuBarMergingAcceptor
-            //---------------------------------------------------------------------------------------------------------
+
             virtual sal_Bool SAL_CALL setMergedMenuBar( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xMergedMenuBar )
                                                        throw (::com::sun::star::uno::RuntimeException, std::exception);
             virtual void SAL_CALL removeMergedMenuBar(  ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
-            //---------------------------------------------------------------------------------------------------------
+
             //  XWindowListener
-            //---------------------------------------------------------------------------------------------------------
             virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception );
             virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception );
             virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception );
             virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception );
 
-            //---------------------------------------------------------------------------------------------------------
             //   XFrameActionListener
-            //---------------------------------------------------------------------------------------------------------
             virtual void SAL_CALL frameAction( const css::frame::FrameActionEvent& aEvent ) throw ( css::uno::RuntimeException, std::exception );
 
-            //---------------------------------------------------------------------------------------------------------
             //  XEventListener
-            //---------------------------------------------------------------------------------------------------------
             using cppu::OPropertySetHelper::disposing;
             virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception );
 
-            //---------------------------------------------------------------------------------------------------------
+
             //  XUIConfigurationListener
-            //---------------------------------------------------------------------------------------------------------
             virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception);
             virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception);
             virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
-            //---------------------------------------------------------------------------------------------------------
             //  XLayoutManagerEventBroadcaster
-            //---------------------------------------------------------------------------------------------------------
             virtual void SAL_CALL addLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
             virtual void SAL_CALL removeLayoutManagerEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManagerListener >& aLayoutManagerListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
             DECL_LINK(MenuBarClose, void *);
             DECL_LINK( WindowEventListener, VclSimpleEvent* );
 
-            //---------------------------------------------------------------------------------------------------------
+
             //  ILayoutNotifications
-            //---------------------------------------------------------------------------------------------------------
+
             virtual void requestLayout( Hint eHint );
 
             /// Reading of settings - shared with ToolbarLayoutManager.
@@ -204,27 +194,27 @@ namespace framework
             DECL_LINK(AsyncLayoutHdl, void *);
 
         private:
-            //---------------------------------------------------------------------------------------------------------
+
             //  helper
-            //---------------------------------------------------------------------------------------------------------
 
-            //---------------------------------------------------------------------------------------------------------
+
+
             //  menu bar
-            //---------------------------------------------------------------------------------------------------------
+
             void impl_clearUpMenuBar();
             void implts_reset( sal_Bool bAttach );
             void implts_updateMenuBarClose();
             sal_Bool implts_resetMenuBar();
 
-            //---------------------------------------------------------------------------------------------------------
+
             //  locking
-            //---------------------------------------------------------------------------------------------------------
+
             void implts_lock();
             sal_Bool implts_unlock();
 
-            //---------------------------------------------------------------------------------------------------------
+
             //  query
-            //---------------------------------------------------------------------------------------------------------
+
             ::com::sun::star::uno::Reference< ::com::sun::star::ui::XUIElement > implts_findElement( const OUString& aName );
 
             void implts_writeNewStateData( const OUString aName, const ::com::sun::star::uno::Reference< com::sun::star::awt::XWindow >& xWindow );
@@ -281,9 +271,9 @@ namespace framework
             DECL_LINK( OptionsChanged, void* );
             DECL_LINK( SettingsChanged, void* );
 
-            //---------------------------------------------------------------------------------------------------------
+
             //  OPropertySetHelper
-            //---------------------------------------------------------------------------------------------------------
+
             virtual sal_Bool                                            SAL_CALL convertFastPropertyValue        ( com::sun::star::uno::Any&        aConvertedValue ,
                                                                                                                 com::sun::star::uno::Any&        aOldValue       ,
                                                                                                                 sal_Int32                        nHandle         ,
diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx
index dbb2819ea73e..6af692938147 100644
--- a/framework/inc/services/mediatypedetectionhelper.hxx
+++ b/framework/inc/services/mediatypedetectionhelper.hxx
@@ -29,13 +29,13 @@
 #include <com/sun/star/util/XStringMapping.hpp>
 
 #include <cppuhelper/implbase2.hxx>
-//_________________________________________________________________________________________________________________
+
 //  namespaces
-//_________________________________________________________________________________________________________________
+
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          -
     @descr          -
 
@@ -50,17 +50,17 @@ namespace framework{
 
 class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper2< ::com::sun::star::util::XStringMapping, css::lang::XServiceInfo>
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
 
     public:
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      standard ctor
             @descr      These initialize a new instance of this class with all needed information for work.
 
@@ -74,7 +74,7 @@ class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper2< ::com::sun::
 
          MediaTypeDetectionHelper( const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      standard destructor
             @descr      This method destruct an instance of this class and clear some member.
 
@@ -88,17 +88,17 @@ class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper2< ::com::sun::
 
         virtual ~MediaTypeDetectionHelper();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XInterface, XTypeProvider, XServiceInfo
-        //---------------------------------------------------------------------------------------------------------
+
 
         DECLARE_XSERVICEINFO
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XStringMapping
-        //---------------------------------------------------------------------------------------------------------
 
-        /*-****************************************************************************************************//**
+
+        /*-****************************************************************************************************
             @short      -
             @descr      -
 
@@ -113,10 +113,10 @@ class MediaTypeDetectionHelper  :   public ::cppu::WeakImplHelper2< ::com::sun::
         virtual sal_Bool SAL_CALL mapStrings(css::uno::Sequence< OUString >& seqParameter)
             throw (css::uno::RuntimeException, std::exception);
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  variables
     //  should be private every time
-    //-------------------------------------------------------------------------------------------------------------
+
 
     private:
 
diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h
index 0214c90715b2..463d8abdba30 100644
--- a/framework/inc/stdtypes.h
+++ b/framework/inc/stdtypes.h
@@ -79,7 +79,7 @@ struct KeyEventEqualsFunc
     }
 };
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     Basic string list based on a std::vector()
@@ -114,7 +114,7 @@ class OUStringList : public ::comphelper::SequenceAsVector< OUString >
         }
 };
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     Basic string queue based on a std::queue()
@@ -123,7 +123,7 @@ class OUStringList : public ::comphelper::SequenceAsVector< OUString >
 */
 typedef ::std::queue< OUString > OUStringQueue;
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     Basic hash based on a boost::unordered_map() which provides key=[OUString] and value=[template type] pairs
@@ -145,7 +145,7 @@ class BaseHash : public ::boost::unordered_map< OUString                    ,
         }
 };
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     Basic OUString hash.
@@ -153,7 +153,7 @@ class BaseHash : public ::boost::unordered_map< OUString                    ,
 */
 typedef BaseHash< OUString > OUStringHashMap;
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     It can be used to map names (e.g. of properties) to her corresponding handles.
@@ -162,7 +162,7 @@ typedef BaseHash< OUString > OUStringHashMap;
 */
 typedef BaseHash< sal_Int32 > NameToHandleHash;
 
-//_________________________________________________________________________________________________________________
+
 
 /**
     Sometimes we need this template to implement listener container ...
diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx
index 2751d9b4d680..f0dbce002352 100644
--- a/framework/inc/tabwin/tabwindow.hxx
+++ b/framework/inc/tabwin/tabwindow.hxx
@@ -72,21 +72,16 @@ class TabWindow :  public ::com::sun::star::lang::XTypeProvider             ,
         using ::cppu::OPropertySetHelper::disposing;
         using ::cppu::OPropertySetHelper::getFastPropertyValue;
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XInitialization
-        //---------------------------------------------------------------------------------------------------------
         virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException, std::exception);
 
-        //---------------------------------------------------------------------------------------------------------
         //  XComponent
-        //---------------------------------------------------------------------------------------------------------
         virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
-        //---------------------------------------------------------------------------------------------------------
         //  XSimpleTabController
-        //---------------------------------------------------------------------------------------------------------
         virtual ::sal_Int32 SAL_CALL insertTab() throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL removeTab( ::sal_Int32 ID ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL setTabProps( ::sal_Int32 ID, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& Properties ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException, std::exception);
@@ -96,14 +91,11 @@ class TabWindow :  public ::com::sun::star::lang::XTypeProvider             ,
         virtual void SAL_CALL addTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL removeTabListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabListener >& Listener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XEventListener
-        //---------------------------------------------------------------------------------------------------------
         virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception );
 
-        //---------------------------------------------------------------------------------------------------------
         //  XTopWindowListener
-        //---------------------------------------------------------------------------------------------------------
         virtual void SAL_CALL windowOpened( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL windowClosing( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL windowClosed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
@@ -112,9 +104,7 @@ class TabWindow :  public ::com::sun::star::lang::XTypeProvider             ,
         virtual void SAL_CALL windowActivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL windowDeactivated( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
-        //---------------------------------------------------------------------------------------------------------
         //  XWindowListener
-        //---------------------------------------------------------------------------------------------------------
         virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception );
         virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception );
         virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception );
@@ -125,9 +115,9 @@ class TabWindow :  public ::com::sun::star::lang::XTypeProvider             ,
         DECL_LINK( Deactivate, TabControl* );
 
     private:
-        //---------------------------------------------------------------------------------------------------------
+
         //  OPropertySetHelper
-        //---------------------------------------------------------------------------------------------------------
+
         virtual sal_Bool                                            SAL_CALL convertFastPropertyValue( com::sun::star::uno::Any&        aConvertedValue ,
                                                                                                        com::sun::star::uno::Any&        aOldValue       ,
                                                                                                        sal_Int32                        nHandle         ,
diff --git a/framework/inc/targets.h b/framework/inc/targets.h
index 8198fbb5cd38..0d7fdf26b28d 100644
--- a/framework/inc/targets.h
+++ b/framework/inc/targets.h
@@ -24,9 +24,9 @@
 
 namespace framework{
 
-//_________________________________________________________________________________________________________________
+
 //  Values for special frame search ... sTargetFrameName of findFrame() or queryDispatch() or loadComponentFromURL()
-//_________________________________________________________________________________________________________________
+
 
 #define SPECIALTARGET_ASCII_SELF            "_self"                             // The frame himself is searched.
 #define SPECIALTARGET_ASCII_PARENT          "_parent"                           // The direct parent frame is searched.
diff --git a/framework/inc/threadhelp/fairrwlock.hxx b/framework/inc/threadhelp/fairrwlock.hxx
index ece091b7e295..8d90ad091281 100644
--- a/framework/inc/threadhelp/fairrwlock.hxx
+++ b/framework/inc/threadhelp/fairrwlock.hxx
@@ -30,7 +30,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          implement a read/write lock with fairness between read/write accessors
     @descr          These implementation never should used as base class! Use it as a member every time.
                     Use ReadGuard and/or WriteGuard in your methods (which work with these lock)
@@ -49,12 +49,12 @@ namespace framework{
 class FairRWLock : public  IRWLock
                  , private INonCopyable
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      standard ctor
             @descr      Initialize instance with right start values for correct working.
                         no reader could exist               =>  m_nReadCount   = 0
@@ -77,7 +77,7 @@ class FairRWLock : public  IRWLock
         {
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @interface  IRWLock
             @short      set lock for reading
             @descr      A guard should call this method to acquire read access on your member.
@@ -110,7 +110,7 @@ class FairRWLock : public  IRWLock
             ++m_nReadCount;
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @interface  IRWLock
             @short      reset lock for reading
             @descr      A guard should call this method to release read access on your member.
@@ -138,7 +138,7 @@ class FairRWLock : public  IRWLock
             }
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @interface  IRWLock
             @short      set lock for writing
             @descr      A guard should call this method to acquire write access on your member.
@@ -164,7 +164,7 @@ class FairRWLock : public  IRWLock
             m_aWriteCondition.wait();
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @interface  IRWLock
             @short      reset lock for writing
             @descr      A guard should call this method to release write access on your member.
@@ -186,7 +186,7 @@ class FairRWLock : public  IRWLock
             m_aSerializer.release();
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @interface  IRWLock
             @short      downgrade a write access to a read access
             @descr      A guard should call this method to change a write to a read access.
@@ -223,9 +223,9 @@ class FairRWLock : public  IRWLock
             m_aSerializer.release();
         }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         ::osl::Mutex        m_aAccessLock       ;   /// regulate access on internal member of this instance
diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx
index 1960909a997e..d3c92c2ace12 100644
--- a/framework/inc/threadhelp/gate.hxx
+++ b/framework/inc/threadhelp/gate.hxx
@@ -28,7 +28,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          implement a gate to block multiple threads at same time or unblock all
     @descr          A gate can be used as a negative-condition! You can open a "door" - wait() will not block ...
                     or you can close it - wait() blocks till open() is called again.
@@ -46,12 +46,12 @@ namespace framework{
 class Gate : public  IGate
            , private INonCopyable
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      ctor
             @descr      These initialize the object right as an open gate.
 
@@ -69,7 +69,7 @@ class Gate : public  IGate
             open();
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      dtor
             @descr      Is user forget it - we open the gate ...
                         blocked threads can running ... but I don't know
@@ -87,7 +87,7 @@ class Gate : public  IGate
             open();
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @interface  IGate
             @short      open the gate
             @descr      A wait() call will not block then.
@@ -110,7 +110,7 @@ class Gate : public  IGate
             m_bClosed = !m_aPassage.check();
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @interface  IGate
             @short      close the gate
             @descr      A wait() call will block then.
@@ -133,7 +133,7 @@ class Gate : public  IGate
             m_bClosed = !m_aPassage.check();
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @interface  IGate
             @short      open gate for current waiting threads
             @descr      All current waiting threads stand in wait() at line "m_aPassage.wait()" ...
@@ -159,7 +159,7 @@ class Gate : public  IGate
             m_bGapOpen = m_aPassage.check();
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @interface  IGate
             @short      must be called to pass the gate
             @descr      If gate "open"   => wait() will not block.
@@ -200,9 +200,9 @@ class Gate : public  IGate
             return bSuccessful;
         }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         ::osl::Mutex        m_aAccessLock   ;
diff --git a/framework/inc/threadhelp/igate.h b/framework/inc/threadhelp/igate.h
index 1d2b2fba4c47..957493c8972a 100644
--- a/framework/inc/threadhelp/igate.h
+++ b/framework/inc/threadhelp/igate.h
@@ -24,17 +24,17 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @descr          We need this interface to support using of different gate implementations in a generic way.
 *//*-*************************************************************************************************************/
 class IGate
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @descr      These functions must be supported by a derived class!
                             open()      -open access for all waiting threads
                             close()     -close access for all further coming threads
diff --git a/framework/inc/threadhelp/inoncopyable.h b/framework/inc/threadhelp/inoncopyable.h
index e5799baca580..bf18ff47e578 100644
--- a/framework/inc/threadhelp/inoncopyable.h
+++ b/framework/inc/threadhelp/inoncopyable.h
@@ -22,7 +22,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @descr          Use this as one of your base classes to disable
                     all possiblities to copy or assign one object to another one!
                     We declare necessary functions private to do so.
diff --git a/framework/inc/threadhelp/irwlock.h b/framework/inc/threadhelp/irwlock.h
index 20a97f104ea3..e8e7165bb9d5 100644
--- a/framework/inc/threadhelp/irwlock.h
+++ b/framework/inc/threadhelp/irwlock.h
@@ -22,7 +22,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @descr          A guard (specialy a write guard) support different internal working states.
                     His lock can set for reading or writing/reading! Or he was unlocked by user ...
 *//*-*************************************************************************************************************/
@@ -33,7 +33,7 @@ enum ELockMode
     E_WRITELOCK
 };
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @descr          We implement two guards for using an rw-lock. But if you wish to implement
                     different rw-locks to you will have problems by using with same guard implementation!
                     Thats why we define this "pure virtual base class" ...
@@ -41,12 +41,12 @@ enum ELockMode
 *//*-*************************************************************************************************************/
 class IRWLock
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @descr      These functions must be supported by a derived class!
                             acquireReadAccess()     -try to register thread as reader
                             releaseReadAccess()     -unregister thread as reader
diff --git a/framework/inc/threadhelp/itransactionmanager.h b/framework/inc/threadhelp/itransactionmanager.h
index 979ca8c197c1..0cbb084ab9eb 100644
--- a/framework/inc/threadhelp/itransactionmanager.h
+++ b/framework/inc/threadhelp/itransactionmanager.h
@@ -26,7 +26,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @descr          Describe different states of a feature of following implementation.
                     During lifetime of an object different working states occur:
                         initialization - working - closing - closed
@@ -44,7 +44,7 @@ enum EWorkingMode
     E_CLOSE          // Object is dead!             -> all calls are rejected!
 };
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @descr          If a request was refused by a transaction manager (internal state different E_WORK ...)
                     user can check the reason by using this enum values.
 *//*-*************************************************************************************************************/
@@ -56,7 +56,7 @@ enum ERejectReason
     E_CLOSED
 };
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @descr          A transaction object should support throwing exceptions if user used it at wrong working mode.
                     e.g. We can throw a DisposedException if user try to work and our mode is E_CLOSE!
                     But sometimes he dont need this feature - will handle it by himself.
@@ -94,7 +94,7 @@ enum EExceptionMode
     E_SOFTEXCEPTIONS
 };
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @descr          How can you use the transaction manager?
                     Use it in combination with an TransactionGuard, which register your transaction in ctor
                     and release in dtor automaticly! Follow interface class can be used to make using
@@ -102,12 +102,12 @@ enum EExceptionMode
 *//*-*************************************************************************************************************/
 class ITransactionManager
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @descr      These functions must be supported by a derived class!
                             getWorkingMode()        -return current set working mode
                             setWorkingMode()        -change working mode
diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx
index b5ca773c1f62..f961f2c2a40e 100644
--- a/framework/inc/threadhelp/lockhelper.hxx
+++ b/framework/inc/threadhelp/lockhelper.hxx
@@ -30,7 +30,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          helper to set right lock in right situation
     @descr          This helper support different types of locking:
                         a)  no locks - transparent for user!
@@ -60,45 +60,45 @@ class FWI_DLLPUBLIC LockHelper : public  IMutex
                  , public  IRWLock
                  , private INonCopyable
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
-        //-------------------------------------------------------------------------------------------------------------
+
         //  ctor/dtor
-        //-------------------------------------------------------------------------------------------------------------
+
                  LockHelper( comphelper::SolarMutex* pSolarMutex = NULL );
         virtual ~LockHelper(                                   );
 
-        //-------------------------------------------------------------------------------------------------------------
+
         //  interface ::framework::IMutex
-        //-------------------------------------------------------------------------------------------------------------
+
         virtual void acquire();
         virtual void release();
 
-        //-------------------------------------------------------------------------------------------------------------
+
         //  interface ::framework::IRWLock
-        //-------------------------------------------------------------------------------------------------------------
+
         virtual void acquireReadAccess   ();
         virtual void releaseReadAccess   ();
         virtual void acquireWriteAccess  ();
         virtual void releaseWriteAccess  ();
         virtual void downgradeWriteAccess();
 
-        //-------------------------------------------------------------------------------------------------------------
+
         //  something else
-        //-------------------------------------------------------------------------------------------------------------
+
         static LockHelper&  getGlobalLock();
             //TODO: this presumable should return the SolarMutex, though it
             // actually returns some independent mutex
 
         ::osl::Mutex&       getShareableOslMutex(                                   );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
     //  Make some member mutable for using in const functions!
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         mutable comphelper::SolarMutex* m_pSolarMutex   ;
diff --git a/framework/inc/threadhelp/readguard.hxx b/framework/inc/threadhelp/readguard.hxx
index afdd17316f3c..4dacd9dc63ee 100644
--- a/framework/inc/threadhelp/readguard.hxx
+++ b/framework/inc/threadhelp/readguard.hxx
@@ -28,7 +28,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          implement a guard to set read locks
     @descr          This guard should be used to set a lock for reading object internal member.
                     Nobody can control it but don't use member after successfully locking for writing!
@@ -46,12 +46,12 @@ namespace framework{
 *//*-*************************************************************************************************************/
 class ReadGuard : private INonCopyable
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      ctor
             @descr      These ctors initialize the guard with a reference to used lock member of object to protect.
                         Null isn't allowed as value!
@@ -71,7 +71,7 @@ class ReadGuard : private INonCopyable
             lock();
         }
 
-        //*********************************************************************************************************
+
         inline ReadGuard( IRWLock& rLock )
             :   m_pLock     ( &rLock    )
             ,   m_bLocked   ( sal_False )
@@ -79,7 +79,7 @@ class ReadGuard : private INonCopyable
             lock();
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      dtor
             @descr      We unlock the used lock member automaticly if user forget it.
 
@@ -95,7 +95,7 @@ class ReadGuard : private INonCopyable
             unlock();
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      set read lock
             @descr      Call this method to set the read lock. The call will block till all current threads are synchronized!
 
@@ -115,7 +115,7 @@ class ReadGuard : private INonCopyable
             }
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      unset read lock
             @descr      Call this method to unlock the rw-lock temp.!
                         Normaly we do it at dtor automaticly for you ...
@@ -136,12 +136,12 @@ class ReadGuard : private INonCopyable
             }
         }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      disable using of these functions!
             @descr      It's not allowed to use this methods. Different problem can occur otherwise.
                         Thats why we disable it by make it private.
@@ -155,9 +155,9 @@ class ReadGuard : private INonCopyable
         *//*-*****************************************************************************************************/
         ReadGuard();
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         IRWLock*    m_pLock     ;   /// reference to lock-member of protected object
diff --git a/framework/inc/threadhelp/resetableguard.hxx b/framework/inc/threadhelp/resetableguard.hxx
index fcb287a33c40..a27941a495dd 100644
--- a/framework/inc/threadhelp/resetableguard.hxx
+++ b/framework/inc/threadhelp/resetableguard.hxx
@@ -28,7 +28,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          implement a guard for implementing save thread access
     @descr          These guard has an additional feature to well known one ::osl::Guard.
                     You can lock() and unlock() it very often!
@@ -46,12 +46,12 @@ namespace framework{
 *//*-*************************************************************************************************************/
 class ResetableGuard : private INonCopyable
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      ctors
             @descr      Use these ctor methods to initialize the guard right.
                         Given lock reference must be valid - otherwise crashes could occur!
@@ -71,7 +71,7 @@ class ResetableGuard : private INonCopyable
             lock();
         }
 
-        //*********************************************************************************************************
+
         inline ResetableGuard( IMutex& rLock )
             :   m_pLock    ( &rLock    )
             ,   m_bLocked  ( sal_False )
@@ -79,7 +79,7 @@ class ResetableGuard : private INonCopyable
             lock();
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      dtor
             @descr      We must release set mutex if programmer forget it ...
 
@@ -95,7 +95,7 @@ class ResetableGuard : private INonCopyable
             unlock();
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      enable/disable the lock
             @descr      Use this methods to lock or unlock the mutex.
                         You can do it so often you wish to do that ...
@@ -122,7 +122,7 @@ class ResetableGuard : private INonCopyable
             }
         }
 
-        //*********************************************************************************************************
+
         inline void unlock()
         {
             if( m_bLocked == sal_True )
@@ -132,12 +132,12 @@ class ResetableGuard : private INonCopyable
             }
         }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      disable using of these functions!
             @descr      It's not allowed to use this methods. Different problem can occur otherwise.
                         Thats why we disable it by make it private.
@@ -151,9 +151,9 @@ class ResetableGuard : private INonCopyable
         *//*-*****************************************************************************************************/
         ResetableGuard();
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         IMutex*         m_pLock     ;   /// pointer to safed lock member of user
diff --git a/framework/inc/threadhelp/threadhelpbase.hxx b/framework/inc/threadhelp/threadhelpbase.hxx
index b769d65b0dc7..4ac22bfcb4f3 100644
--- a/framework/inc/threadhelp/threadhelpbase.hxx
+++ b/framework/inc/threadhelp/threadhelpbase.hxx
@@ -24,7 +24,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          "baseclass" to make own classes threadsafe
     @descr          Sometimes you must share your lock- or mutex member with any other baseclasses.
                     And baseclasses are initialized erlier then members! That's why you should use
@@ -41,19 +41,19 @@ namespace framework{
 *//*-*************************************************************************************************************/
 struct ThreadHelpBase
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
         ThreadHelpBase( comphelper::SolarMutex* pSolarMutex = NULL )
                 :   m_aLock( pSolarMutex )
         {
         }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public member
     //  Make it mutable for using in const functions!
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
         mutable LockHelper m_aLock;
diff --git a/framework/inc/threadhelp/transactionbase.hxx b/framework/inc/threadhelp/transactionbase.hxx
index a36f4aa2b264..70308e781dad 100644
--- a/framework/inc/threadhelp/transactionbase.hxx
+++ b/framework/inc/threadhelp/transactionbase.hxx
@@ -24,7 +24,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          make it possible to instanciate a transacion manager as first member!
     @descr          If you use a transaction manager as a member of your class and wish to use it earlier then other ones
                     you should have a look on this implementation. You must use it as the first base class
@@ -38,9 +38,9 @@ namespace framework{
 *//*-*************************************************************************************************************/
 struct TransactionBase
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public member
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
         mutable TransactionManager    m_aTransactionManager    ;   /// "your" public manager-member!
diff --git a/framework/inc/threadhelp/transactionguard.hxx b/framework/inc/threadhelp/transactionguard.hxx
index 858fd9909738..352bdcf87211 100644
--- a/framework/inc/threadhelp/transactionguard.hxx
+++ b/framework/inc/threadhelp/transactionguard.hxx
@@ -25,7 +25,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          implement a guard to support non breakable transactions
     @descr          If you wish to support non breakable method calls without lockingf any mutex, rw-lock or
                     something like that - you should use this guard implementation.
@@ -44,12 +44,12 @@ namespace framework{
 *//*-*************************************************************************************************************/
 class TransactionGuard : private INonCopyable
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      ctors
             @descr      Use these ctor methods to initialize the guard right.
                         Given reference must be valid - otherwise crashes could occur!
@@ -83,7 +83,7 @@ class TransactionGuard : private INonCopyable
             }
         }
 
-        /*-************************************************************************************************************//**
+        /*-************************************************************************************************************
             @short      dtor
             @descr      We must release the transaction manager and can forget his pointer.
 
@@ -99,7 +99,7 @@ class TransactionGuard : private INonCopyable
             stop();
         }
 
-        /*-************************************************************************************************************//**
+        /*-************************************************************************************************************
             @short      stop current transaction
             @descr      We must release the transaction manager and can forget his pointer.
 
@@ -123,12 +123,12 @@ class TransactionGuard : private INonCopyable
             }
         }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      disable using of these functions!
             @descr      It's not allowed to use this methods. Different problem can occur otherwise.
                         Thats why we disable it by make it private.
@@ -142,9 +142,9 @@ class TransactionGuard : private INonCopyable
         *//*-*****************************************************************************************************/
         TransactionGuard();
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         ITransactionManager*   m_pManager   ;   /// pointer to safed transaction manager
diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx
index 4f029aa5fd00..104b9fddb24d 100644
--- a/framework/inc/threadhelp/transactionmanager.hxx
+++ b/framework/inc/threadhelp/transactionmanager.hxx
@@ -34,7 +34,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          implement a transaction manager to support non breakable interface methods
     @descr          Use it to support non breakable interface methods without using any thread
                     synchronization like e.g. mutex, rw-lock!
@@ -51,9 +51,9 @@ namespace framework{
 class FWI_DLLPUBLIC TransactionManager : public  ITransactionManager
                          , private INonCopyable
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
                                    TransactionManager           (                                              );
@@ -64,16 +64,16 @@ class FWI_DLLPUBLIC TransactionManager : public  ITransactionManager
         virtual void               registerTransaction          ( EExceptionMode eMode, ERejectReason& eReason ) throw( css::uno::RuntimeException, css::lang::DisposedException );
         virtual void               unregisterTransaction        (                                              ) throw( css::uno::RuntimeException, css::lang::DisposedException );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         void impl_throwExceptions( EExceptionMode eMode, ERejectReason eReason ) const throw( css::uno::RuntimeException, css::lang::DisposedException );
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         mutable ::osl::Mutex    m_aAccessLock           ;   /// regulate access on internal member of this instance
diff --git a/framework/inc/threadhelp/writeguard.hxx b/framework/inc/threadhelp/writeguard.hxx
index faf123086ca9..74ba3c606b20 100644
--- a/framework/inc/threadhelp/writeguard.hxx
+++ b/framework/inc/threadhelp/writeguard.hxx
@@ -26,7 +26,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          implement a guard to set write locks
     @descr          This guard should be used to set a lock for reading AND writing object internal member.
                     We never need a own mutex to safe our internal member access - because
@@ -43,12 +43,12 @@ namespace framework{
 *//*-*************************************************************************************************************/
 class WriteGuard : private INonCopyable
 {
-    //-------------------------------------------------------------------------------------------------------------
+
     //  public methods
-    //-------------------------------------------------------------------------------------------------------------
+
     public:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      ctor
             @descr      These ctors initialize the guard with a reference to used lock member of object to protect.
                         Null isn't allowed as value!
@@ -68,7 +68,7 @@ class WriteGuard : private INonCopyable
             lock();
         }
 
-        //*********************************************************************************************************
+
         inline WriteGuard( IRWLock& rLock )
             :   m_pLock ( &rLock    )
             ,   m_eMode ( E_NOLOCK  )
@@ -76,7 +76,7 @@ class WriteGuard : private INonCopyable
             lock();
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      dtor
             @descr      We unlock the used lock member automaticly if user forget it.
 
@@ -92,7 +92,7 @@ class WriteGuard : private INonCopyable
             unlock();
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      set write lock
             @descr      Call this method to set the write lock. The call will block till all current threads are synchronized!
 
@@ -126,7 +126,7 @@ class WriteGuard : private INonCopyable
             }
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      unset write lock
             @descr      Call this method to unlock the rw-lock temp.!
                         Normaly we do it at dtor automaticly for you ...
@@ -158,7 +158,7 @@ class WriteGuard : private INonCopyable
             }
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      downgrade write access to read access without new blocking!
             @descr      If this write lock is set you can change it to a "read lock".
                         An "upgrade" is the same like new calling "lock()"!
@@ -179,7 +179,7 @@ class WriteGuard : private INonCopyable
             }
         }
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      return internal states
             @descr      For user they dont know what they are doing ...
 
@@ -195,12 +195,12 @@ class WriteGuard : private INonCopyable
             return m_eMode;
         }
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private methods
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      disable using of these functions!
             @descr      It's not allowed to use this methods. Different problem can occur otherwise.
                         Thats why we disable it by make it private.
@@ -214,9 +214,9 @@ class WriteGuard : private INonCopyable
         *//*-*****************************************************************************************************/
         WriteGuard();
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  private member
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
 
         IRWLock*    m_pLock ;   /// reference to lock-member of protected object
diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx
index 346caff49e87..95ba6d34c5bf 100644
--- a/framework/inc/uielement/itemcontainer.hxx
+++ b/framework/inc/uielement/itemcontainer.hxx
@@ -49,9 +49,9 @@ class FWI_DLLPUBLIC ItemContainer :   public ::cppu::WeakImplHelper1< ::com::sun
         ItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccessContainer, const ShareableMutex& rMutex );
         virtual ~ItemContainer();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XInterface, XTypeProvider
-        //---------------------------------------------------------------------------------------------------------
+
         // XUnoTunnel
         static const ::com::sun::star::uno::Sequence< sal_Int8 >&   GetUnoTunnelId() throw();
         static ItemContainer*                                       GetImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxIFace ) throw();
diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx
index dabe2b960edd..0cb648ab2839 100644
--- a/framework/inc/uielement/menubarwrapper.hxx
+++ b/framework/inc/uielement/menubarwrapper.hxx
@@ -43,9 +43,9 @@ class MenuBarWrapper : public UIConfigElementWrapperBase,
             const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& xContext );
         virtual ~MenuBarWrapper();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XInterface, XTypeProvider
-        //---------------------------------------------------------------------------------------------------------
+
         FWK_DECLARE_XINTERFACE
         FWK_DECLARE_XTYPEPROVIDER
 
diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx
index b67391487027..0d883d0b36f5 100644
--- a/framework/inc/uielement/progressbarwrapper.hxx
+++ b/framework/inc/uielement/progressbarwrapper.hxx
@@ -37,9 +37,9 @@ namespace framework{
 class ProgressBarWrapper : public UIElementWrapperBase
 {
     public:
-        //---------------------------------------------------------------------------------------------------------
+
         //  constructor / destructor
-        //---------------------------------------------------------------------------------------------------------
+
         ProgressBarWrapper();
         virtual ~ProgressBarWrapper();
 
@@ -67,10 +67,10 @@ class ProgressBarWrapper : public UIElementWrapperBase
         // XUIElement
         virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getRealInterface() throw (::com::sun::star::uno::RuntimeException, std::exception);
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  variables
     //  (should be private everyway!)
-    //-------------------------------------------------------------------------------------------------------------
+
     private:
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow >         m_xStatusBar;    // Reference to our status bar XWindow
         ::com::sun::star::uno::WeakReference< ::com::sun::star::uno::XInterface >  m_xProgressBarIfacWrapper;
diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx
index 0646d0db1f44..3403975d36e1 100644
--- a/framework/inc/uielement/rootitemcontainer.hxx
+++ b/framework/inc/uielement/rootitemcontainer.hxx
@@ -61,7 +61,7 @@ class RootItemContainer :   protected ThreadHelpBase
         FWI_DLLPUBLIC RootItemContainer( const com::sun::star::uno::Reference< com::sun::star::container::XIndexAccess >& rItemAccessContainer );
         virtual FWI_DLLPUBLIC ~RootItemContainer();
 
-        //---------------------------------------------------------------------------------------------------------
+
         // XInterface
         virtual void SAL_CALL acquire() throw ()
             { OWeakObject::acquire(); }
diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
index 28e83de40933..c4fcfbe2d96d 100644
--- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
+++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx
@@ -43,9 +43,9 @@ class StatusIndicatorInterfaceWrapper :   public ::cppu::WeakImplHelper1< ::com:
         StatusIndicatorInterfaceWrapper( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& rStatusIndicatorImpl );
         virtual ~StatusIndicatorInterfaceWrapper();
 
-        //---------------------------------------------------------------------------------------------------------
+
         //  XStatusIndicator
-        //---------------------------------------------------------------------------------------------------------
+
         virtual void SAL_CALL start   ( const OUString& sText  ,
                                               sal_Int32        nRange ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
         virtual void SAL_CALL end     (                               ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx
index 4cf6318bfe1e..e8393e4dc507 100644
--- a/framework/inc/uielement/toolbarwrapper.hxx
+++ b/framework/inc/uielement/toolbarwrapper.hxx
@@ -66,9 +66,9 @@ class ToolBarWrapper : public ::com::sun::star::ui::XUIFunctionListener,
         using cppu::OPropertySetHelper::disposing;
         virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& aEvent ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
-    //-------------------------------------------------------------------------------------------------------------
+
     //  protected methods
-    //-------------------------------------------------------------------------------------------------------------
+
     protected:
         virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const com::sun::star::uno::Any&  aValue ) throw( com::sun::star::uno::Exception, std::exception );
         virtual void impl_fillNewData();
diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx
index d74bcd8e12e1..6f3c8ed56af8 100644
--- a/framework/inc/uifactory/factoryconfiguration.hxx
+++ b/framework/inc/uifactory/factoryconfiguration.hxx
@@ -35,16 +35,16 @@
 #include <cppuhelper/implbase1.hxx>
 #include <rtl/ustring.hxx>
 
-//_________________________________________________________________________________________________________________
+
 //  Namespace
-//_________________________________________________________________________________________________________________
+
 
 namespace framework
 {
 
-//*****************************************************************************************************************
+
 //  Configuration access class for PopupMenuControllerFactory implementation
-//*****************************************************************************************************************
+
 class ConfigurationAccess_ControllerFactory : // interfaces
                                                     private ThreadHelpBase,
                                                     public  ::cppu::WeakImplHelper1< ::com::sun::star::container::XContainerListener>
diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx
index f9364a3c5d1a..19f930a3e0c2 100644
--- a/framework/inc/xml/acceleratorconfigurationreader.hxx
+++ b/framework/inc/xml/acceleratorconfigurationreader.hxx
@@ -39,12 +39,12 @@ namespace framework{
 class AcceleratorConfigurationReader : private ThreadHelpBase
                                      , public ::cppu::WeakImplHelper1< css::xml::sax::XDocumentHandler >
 {
-    //-------------------------------------------
+
     // const, types
 
     private:
 
-        //---------------------------------------
+
         /** @short  classification of XML elements. */
         enum EXMLElement
         {
@@ -52,7 +52,7 @@ class AcceleratorConfigurationReader : private ThreadHelpBase
             E_ELEMENT_ITEM
         };
 
-        //---------------------------------------
+
         /** @short  classification of XML attributes. */
         enum EXMLAttribute
         {
@@ -64,7 +64,7 @@ class AcceleratorConfigurationReader : private ThreadHelpBase
             E_ATTRIBUTE_URL
         };
 
-        //---------------------------------------
+
         /** @short  some namespace defines */
         enum EAcceleratorXMLNamespace
         {
@@ -72,31 +72,31 @@ class AcceleratorConfigurationReader : private ThreadHelpBase
             E_NAMESPACE_XLINK
         };
 
-    //-------------------------------------------
+
     // member
 
     private:
 
-        //---------------------------------------
+
         /** @short  needed to read the xml configuration. */
         css::uno::Reference< css::xml::sax::XDocumentHandler > m_xReader;
 
-        //---------------------------------------
+
         /** @short  reference to the outside container, where this
                     reader/writer must work on. */
         AcceleratorCache& m_rContainer;
 
-        //---------------------------------------
+
         /** @short  used to detect if an accelerator list
                     occurs recursive inside xml. */
         sal_Bool m_bInsideAcceleratorList;
 
-        //---------------------------------------
+
         /** @short  used to detect if an accelerator item
                     occurs recursive inside xml. */
         sal_Bool m_bInsideAcceleratorItem;
 
-        //---------------------------------------
+
         /** @short  is used to map key codes to its
                     string representation.
 
@@ -105,7 +105,7 @@ class AcceleratorConfigurationReader : private ThreadHelpBase
                     alive forever ...*/
         ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping;
 
-        //---------------------------------------
+
         /** @short  provide information about the parsing state.
 
             @descr  We use it to find out the line and column, where
@@ -113,12 +113,12 @@ class AcceleratorConfigurationReader : private ThreadHelpBase
           */
         css::uno::Reference< css::xml::sax::XLocator > m_xLocator;
 
-    //-------------------------------------------
+
     // interface
 
     public:
 
-        //---------------------------------------
+
         /** @short  connect this new reader/writer instance
                     to an outside container, which should be used
                     flushed to the underlying XML configuration or
@@ -129,11 +129,11 @@ class AcceleratorConfigurationReader : private ThreadHelpBase
           */
         AcceleratorConfigurationReader(AcceleratorCache& rContainer);
 
-        //---------------------------------------
+
         /** @short  does nothing real ... */
         virtual ~AcceleratorConfigurationReader();
 
-        //---------------------------------------
+
         // XDocumentHandler
         virtual void SAL_CALL startDocument()
             throw(css::xml::sax::SAXException,
@@ -169,20 +169,20 @@ class AcceleratorConfigurationReader : private ThreadHelpBase
             throw(css::xml::sax::SAXException,
                   css::uno::RuntimeException, std::exception );
 
-    //-------------------------------------------
+
     // helper
 
     private:
 
-        //---------------------------------------
+
         /** TODO document me */
         static EXMLElement implst_classifyElement(const OUString& sElement);
 
-        //---------------------------------------
+
         /** TODO document me */
         static EXMLAttribute implst_classifyAttribute(const OUString& sAttribute);
 
-        //---------------------------------------
+
         /** TODO document me */
         OUString implts_getErrorLineString();
 };
diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx
index e0119b729b63..00190cbfe381 100644
--- a/framework/inc/xml/acceleratorconfigurationwriter.hxx
+++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx
@@ -34,21 +34,21 @@ namespace framework{
 
 class AcceleratorConfigurationWriter : private ThreadHelpBase
 {
-    //-------------------------------------------
+
     // member
 
     private:
 
-        //---------------------------------------
+
         /** @short  needed to write the xml configuration. */
         css::uno::Reference< css::xml::sax::XDocumentHandler > m_xConfig;
 
-        //---------------------------------------
+
         /** @short  reference to the outside container, where this
                     writer must work on. */
         const AcceleratorCache& m_rContainer;
 
-        //---------------------------------------
+
         /** @short  is used to map key codes to its
                     string representation.
 
@@ -57,12 +57,12 @@ class AcceleratorConfigurationWriter : private ThreadHelpBase
                     alive forever ...*/
         ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping;
 
-    //-------------------------------------------
+
     // interface
 
     public:
 
-        //---------------------------------------
+
         /** @short  connect this new writer instance
                     to an outside container, which should be
                     flushed to the underlying XML configuration.
@@ -76,20 +76,20 @@ class AcceleratorConfigurationWriter : private ThreadHelpBase
         AcceleratorConfigurationWriter(const AcceleratorCache&                                       rContainer,
                                        const css::uno::Reference< css::xml::sax::XDocumentHandler >& xConfig   );
 
-        //---------------------------------------
+
         /** @short  does nothing real ... */
         virtual ~AcceleratorConfigurationWriter();
 
-        //---------------------------------------
+
         /** @short  TODO */
         virtual void flush();
 
-    //-------------------------------------------
+
     // helper
 
     private:
 
-        //---------------------------------------
+
         /** @short  TODO */
         void impl_ts_writeKeyCommandPair(const css::awt::KeyEvent&                                     aKey    ,
                                          const OUString&                                        sCommand,
diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx
index 5f23c809bd62..3791b3f99ee0 100644
--- a/framework/inc/xml/imagesdocumenthandler.hxx
+++ b/framework/inc/xml/imagesdocumenthandler.hxx
@@ -34,7 +34,7 @@
 
 namespace framework{
 
-//*****************************************************************************************************************
+
 // Hash code function for using in all hash maps of follow implementation.
 
 class OReadImagesDocumentHandler : private ThreadHelpBase,  // Struct for right initalization of lock member! Must be first of baseclasses.
diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx
index d5b6cf79b3b7..b9cd3509376f 100644
--- a/framework/inc/xml/statusbardocumenthandler.hxx
+++ b/framework/inc/xml/statusbardocumenthandler.hxx
@@ -34,7 +34,7 @@
 
 namespace framework{
 
-//*****************************************************************************************************************
+
 // Hash code function for using in all hash maps of follow implementation.
 
 class FWE_DLLPUBLIC OReadStatusBarDocumentHandler : private ThreadHelpBase, // Struct for right initalization of lock member! Must be first of baseclasses.
diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx
index 22a4b4e650a6..f57ce625a9fe 100644
--- a/framework/inc/xml/toolboxdocumenthandler.hxx
+++ b/framework/inc/xml/toolboxdocumenthandler.hxx
@@ -33,7 +33,7 @@
 
 namespace framework{
 
-//*****************************************************************************************************************
+
 // Hash code function for using in all hash maps of follow implementation.
 
 class FWE_DLLPUBLIC OReadToolBoxDocumentHandler : private ThreadHelpBase,   // Struct for right initalization of lock member! Must be first of baseclasses.
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.
diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx
index ca2977a8b989..6233d40712ae 100644
--- a/framework/source/accelerators/globalacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx
@@ -126,9 +126,9 @@ void GlobalAcceleratorConfiguration::fillCache()
 }
 
 
-//
+
 // XComponent.dispose(),  #i120029#, to release the cyclic reference
-//
+
 void SAL_CALL GlobalAcceleratorConfiguration::dispose()
     throw(css::uno::RuntimeException, std::exception)
 {
diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
index a33a2e64de87..5b832e2e4835 100644
--- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx
+++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx
@@ -169,9 +169,9 @@ void ModuleAcceleratorConfiguration::fillCache()
 }
 
 
-//
+
 // XComponent.dispose(),  #i120029#, to release the cyclic reference
-//
+
 void SAL_CALL ModuleAcceleratorConfiguration::dispose()
     throw(css::uno::RuntimeException, std::exception)
 {
diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx
index 7047b64a9300..e3bdfb1daebd 100644
--- a/framework/source/accelerators/storageholder.cxx
+++ b/framework/source/accelerators/storageholder.cxx
@@ -583,7 +583,7 @@ OUStringList StorageHolder::impl_st_parsePath(const OUString& sPath)
     return lToken;
 }
 
-//===============================================
+
 } // namespace framework
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx
index b425aaa538bf..0f508701ea14 100644
--- a/framework/source/classes/taskcreator.cxx
+++ b/framework/source/classes/taskcreator.cxx
@@ -34,7 +34,7 @@
 
 namespace framework{
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      initialize instance with necessary information
     @descr      We need a valid uno service manager to create or instanciate new services.
                 All other information to create frames or tasks come in on right interface methods.
@@ -48,7 +48,7 @@ TaskCreator::TaskCreator( const css::uno::Reference< css::uno::XComponentContext
 {
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      deinitialize instance
     @descr      We should release all used resource which are not needed any longer.
 *//*-*****************************************************************************************************/
@@ -57,7 +57,7 @@ TaskCreator::~TaskCreator()
     m_xContext.clear();
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     TODO document me
 *//*-*****************************************************************************************************/
 css::uno::Reference< css::frame::XFrame > TaskCreator::createTask( const OUString& sName    ,
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx
index c5e006ba4719..a71c621e5ed2 100644
--- a/framework/source/dispatch/menudispatcher.cxx
+++ b/framework/source/dispatch/menudispatcher.cxx
@@ -65,9 +65,9 @@ static sal_Bool impldbg_checkParameter_addStatusListener    (   const   css::uno
                                                                 const   css::util::URL&                                         aURL            );
 static sal_Bool impldbg_checkParameter_removeStatusListener (   const   css::uno::Reference< css::frame::XStatusListener >&     xControl        ,
                                                                 const   css::util::URL&                                         aURL            );
-//*****************************************************************************************************************
+
 //  constructor
-//*****************************************************************************************************************
+
 MenuDispatcher::MenuDispatcher(   const   uno::Reference< XComponentContext >&  xContext    ,
                                   const   uno::Reference< XFrame >&             xOwner      )
         //  Init baseclasses first
@@ -88,9 +88,9 @@ MenuDispatcher::MenuDispatcher(   const   uno::Reference< XComponentContext >&
     xOwner->addFrameActionListener( uno::Reference< XFrameActionListener >( (OWeakObject *)this, UNO_QUERY ));
 }
 
-//*****************************************************************************************************************
+
 //  destructor
-//*****************************************************************************************************************
+
 MenuDispatcher::~MenuDispatcher()
 {
     // Warn programmer if he forgot to dispose this instance.
@@ -98,17 +98,17 @@ MenuDispatcher::~MenuDispatcher()
     // and a dtor isn't the best place to do that!
 }
 
-//*****************************************************************************************************************
+
 //  XDispatch
-//*****************************************************************************************************************
+
 void SAL_CALL MenuDispatcher::dispatch(    const   URL&                        /*aURL*/            ,
                                             const   Sequence< PropertyValue >&  /*seqProperties*/   ) throw( RuntimeException, std::exception )
 {
 }
 
-//*****************************************************************************************************************
+
 //  XDispatch
-//*****************************************************************************************************************
+
 void SAL_CALL MenuDispatcher::addStatusListener(   const   uno::Reference< XStatusListener >&   xControl,
                                                     const   URL&                            aURL    ) throw( RuntimeException, std::exception )
 {
@@ -121,9 +121,9 @@ void SAL_CALL MenuDispatcher::addStatusListener(   const   uno::Reference< XStat
     m_aListenerContainer.addInterface( aURL.Complete, xControl );
 }
 
-//*****************************************************************************************************************
+
 //  XDispatch
-//*****************************************************************************************************************
+
 void SAL_CALL MenuDispatcher::removeStatusListener(    const   uno::Reference< XStatusListener >&   xControl,
                                                         const   URL&                            aURL    ) throw( RuntimeException, std::exception )
 {
@@ -136,9 +136,9 @@ void SAL_CALL MenuDispatcher::removeStatusListener(    const   uno::Reference< X
     m_aListenerContainer.removeInterface( aURL.Complete, xControl );
 }
 
-//*****************************************************************************************************************
+
 //   XFrameActionListener
-//*****************************************************************************************************************
+
 
 void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) throw ( RuntimeException, std::exception )
 {
@@ -175,9 +175,8 @@ void SAL_CALL MenuDispatcher::frameAction( const FrameActionEvent& aEvent ) thro
     }
 }
 
-//*****************************************************************************************************************
+
 //   XEventListener
-//*****************************************************************************************************************
 void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
@@ -214,9 +213,9 @@ void SAL_CALL MenuDispatcher::disposing( const EventObject& ) throw( RuntimeExce
     }
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAccel )
 {
     for ( sal_uInt16 nPos = 0; nPos < pMenu->GetItemCount(); ++nPos )
@@ -234,9 +233,9 @@ void MenuDispatcher::impl_setAccelerators( Menu* pMenu, const Accelerator& aAcce
     }
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromResource )
 {
     uno::Reference< XFrame > xFrame( m_xOwnerWeak.get(), UNO_QUERY );
@@ -318,7 +317,7 @@ static sal_Bool impldbg_checkParameter_MenuDispatcher(   const   uno::Reference<
     return xContext.is() && xOwner.is();
 }
 
-//*****************************************************************************************************************
+
 // We need a valid URL. What is meaning with "register for nothing"?!
 // xControl must correct to - nobody can advised otherwise!
 static sal_Bool impldbg_checkParameter_addStatusListener( const   uno::Reference< XStatusListener >&   xControl,
@@ -339,7 +338,7 @@ static sal_Bool impldbg_checkParameter_addStatusListener( const   uno::Reference
     return bOK ;
 }
 
-//*****************************************************************************************************************
+
 // The same goes for these case! We have added valid listener for correct URL only.
 // We can't remove invalid listener for nothing!
 static sal_Bool impldbg_checkParameter_removeStatusListener(  const   uno::Reference< XStatusListener >&   xControl,
diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx
index 2227ddf94413..dfaea211947e 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -33,9 +33,9 @@
 
 namespace framework{
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
+
 
 DEFINE_XSERVICEINFO_MULTISERVICE    (   Oxt_Handler                                                ,
                                         ::cppu::OWeakObject                                        ,
@@ -48,7 +48,7 @@ DEFINE_INIT_SERVICE                 (   Oxt_Handler,
                                         }
                                     )
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      standard ctor
     @descr      These initialize a new instance of this class with needed information for work.
 
@@ -68,7 +68,7 @@ Oxt_Handler::Oxt_Handler( const css::uno::Reference< css::lang::XMultiServiceFac
 {
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      standard dtor
     @descr      -
 
@@ -91,7 +91,7 @@ Oxt_Handler::~Oxt_Handler()
     }
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  ::com::sun::star::frame::XDispatch
 
     @short      try to load audio file
@@ -150,7 +150,7 @@ void SAL_CALL Oxt_Handler::dispatch( const css::util::URL&
     dispatchWithNotification( aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >() );
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  ::com::sun::star::document::XExtendedFilterDetection
 
     @short      try to detect file (given as argument included in "lDescriptor")
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 3ed1f1b6f7e7..2fc0bef59fcd 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -221,7 +221,7 @@ class AddonsOptions_Impl : public ConfigItem
         //  overloaded methods of baseclass
 
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      called for notify of configmanager
             @descr      These method is called from the ConfigManager before application ends or from the
                          PropertyChangeListener if the sub tree broadcasts changes. You must update your
@@ -237,7 +237,7 @@ class AddonsOptions_Impl : public ConfigItem
 
         virtual void Notify( const Sequence< OUString >& lPropertyNames );
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      write changes to configuration
             @descr      These method writes the changed values into the sub tree
                         and should always called in our destructor to guarantee consistency of config data.
@@ -256,7 +256,7 @@ class AddonsOptions_Impl : public ConfigItem
         //  public interface
 
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      base implementation of public interface for "SvtDynamicMenuOptions"!
             @descr      These class is used as static member of "SvtDynamicMenuOptions" ...
                         => The code exist only for one time and isn't duplicated for every instance!
@@ -312,7 +312,7 @@ class AddonsOptions_Impl : public ConfigItem
         typedef ::boost::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHash, ::std::equal_to< OUString > > ToolbarMergingInstructions;
 
 
-        /*-****************************************************************************************************//**
+        /*-****************************************************************************************************
             @short      return list of key names of our configuration management which represent oue module tree
             @descr      These methods return the current list of key names! We need it to get needed values from our
                         configuration management!
@@ -400,9 +400,9 @@ void AddonsOptions_Impl::ImageEntry::addImage(ImageSize eSize,
     aURL[(int)eSize] = rURL;
 }
 
-//*****************************************************************************************************************
+
 //  constructor
-//*****************************************************************************************************************
+
 AddonsOptions_Impl::AddonsOptions_Impl()
     // Init baseclasses first
     : ConfigItem( ROOTNODE_ADDONMENU ),
@@ -471,9 +471,9 @@ AddonsOptions_Impl::AddonsOptions_Impl()
     EnableNotification( aNotifySeq );
 }
 
-//*****************************************************************************************************************
+
 //  destructor
-//*****************************************************************************************************************
+
 AddonsOptions_Impl::~AddonsOptions_Impl()
 {
     // We must save our current values .. if user forget it!
@@ -509,57 +509,57 @@ void AddonsOptions_Impl::ReadConfigurationData()
     ReadStatusbarMergeInstructions( m_aCachedStatusbarMergingInstructions );
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 void AddonsOptions_Impl::Notify( const Sequence< OUString >& /*lPropertyNames*/ )
 {
     Application::PostUserEvent( STATIC_LINK( 0, AddonsOptions, Notify ) );
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 void AddonsOptions_Impl::Commit()
 {
     OSL_FAIL( "AddonsOptions_Impl::Commit()\nNot implemented yet!\n" );
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::HasAddonsMenu() const
 {
     return ( m_aCachedMenuProperties.getLength() > 0 );
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 sal_Int32 AddonsOptions_Impl::GetAddonsToolBarCount() const
 {
     return m_aCachedToolBarPartProperties.size();
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenu() const
 {
     return m_aCachedMenuProperties;
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsMenuBarPart() const
 {
     return m_aCachedMenuBarPartProperties;
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBarPart( sal_uInt32 nIndex ) const
 {
     if ( /*nIndex >= 0 &&*/ nIndex < m_aCachedToolBarPartProperties.size() )
@@ -568,9 +568,9 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBa
         return m_aEmptyAddonToolBar;
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 const OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const
 {
     if ( nIndex < m_aCachedToolBarPartResourceNames.size() )
@@ -579,25 +579,25 @@ const OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nInd
         return OUString();
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsHelpMenu  () const
 {
     return m_aCachedHelpMenuProperties;
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 const MergeMenuInstructionContainer& AddonsOptions_Impl::GetMergeMenuInstructions() const
 {
     return m_aCachedMergeMenuInsContainer;
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 bool AddonsOptions_Impl::GetMergeToolbarInstructions(
     const OUString& rToolbarName,
     MergeToolbarInstructionContainer& rToolbarInstructions ) const
@@ -617,9 +617,9 @@ const MergeStatusbarInstructionContainer& AddonsOptions_Impl::GetMergeStatusbarI
     return m_aCachedStatusbarMergingInstructions;
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 static Image ScaleImage( const Image &rImage, bool bBig )
 {
     Size aSize = ToolBox::GetDefaultImageSize(bBig);
@@ -679,9 +679,9 @@ Image AddonsOptions_Impl::GetImageFromURL( const OUString& aURL, sal_Bool bBig,
     return aImage;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq )
 {
     // Read the AddonMenu set and fill property sequences
@@ -718,9 +718,9 @@ sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue
     return ( rAddonMenuSeq.getLength() > 0 );
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq )
 {
     // Read the AddonMenu set and fill property sequences
@@ -757,9 +757,9 @@ sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValu
     return ( rAddonOfficeHelpMenuSeq.getLength() > 0 );
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq )
 {
     // Read the OfficeMenuBar set and fill property sequences
@@ -813,9 +813,9 @@ sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyV
     return ( rAddonOfficeMenuBarSeq.getLength() > 0 );
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< OUString >& rAddonOfficeToolBarResNames )
 {
     // Read the OfficeToolBar set and fill property sequences
@@ -837,9 +837,9 @@ sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeTo
 }
 
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString rToolBarItemSetNodeName, Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq )
 {
     sal_Bool                    bInsertSeparator        = sal_False;
@@ -881,9 +881,9 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString rToolBarItemSetN
     return ( (sal_uInt32)rAddonOfficeToolBarSeq.getLength() > nToolBarItemCount );
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 void AddonsOptions_Impl::InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq )
 {
     Sequence< PropertyValue >   aToolBarItem( PROPERTYCOUNT_TOOLBARITEM );
@@ -906,9 +906,9 @@ void AddonsOptions_Impl::InsertToolBarSeparator( Sequence< Sequence< PropertyVal
 }
 
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
 {
     // Read the user-defined Images set and fill image manager
@@ -958,9 +958,9 @@ void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
     }
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 
 OUString AddonsOptions_Impl::GeneratePrefixURL()
 {
@@ -974,9 +974,9 @@ OUString AddonsOptions_Impl::GeneratePrefixURL()
     return aPopupMenuURL;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 
 sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer )
 {
@@ -1044,9 +1044,9 @@ sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionCont
     return sal_True;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu )
 {
     OUString aMergeMenuBaseNode( aMergeAddonInstructionBase+m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MENUITEMS ] );
@@ -1061,9 +1061,9 @@ sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstr
     return ReadSubMenuEntries( aSubMenuNodeNames, rMergeMenu );
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions )
 {
     const OUString aToolbarMergeRootName( "AddonUI/OfficeToolbarMerging/" );
@@ -1136,9 +1136,9 @@ sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstruc
     return sal_True;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems )
 {
     OUStringBuffer aBuffer( aMergeAddonInstructionBase );
@@ -1284,9 +1284,9 @@ sal_Bool AddonsOptions_Impl::ReadStatusBarItem(
     return bResult;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu )
 {
     sal_Bool            bResult = sal_False;
@@ -1358,9 +1358,9 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequen
     return bResult;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu )
 {
     sal_Bool            bResult = sal_False;
@@ -1399,9 +1399,9 @@ sal_Bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName,
     return bResult;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu )
 {
     Sequence< Sequence< PropertyValue > > aTargetSubMenuSeq;
@@ -1420,9 +1420,9 @@ sal_Bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTarget
     return sal_True;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem )
 {
     sal_Bool            bResult = sal_False;
@@ -1477,9 +1477,9 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeNa
     return bResult;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq )
 {
     Sequence< PropertyValue > aMenuItem( PROPERTYCOUNT_MENUITEM );
@@ -1507,9 +1507,9 @@ sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSu
     return sal_True;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL )
 {
     // FIXME: potentially this is not so useful in a world of delayed image loading
@@ -1517,9 +1517,9 @@ sal_Bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL )
     return ( pIter != m_aImageManager.end() );
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 void AddonsOptions_Impl::SubstituteVariables( OUString& aURL )
 {
     if ( aURL.startsWith( EXPAND_PROTOCOL ) )
@@ -1534,9 +1534,9 @@ void AddonsOptions_Impl::SubstituteVariables( OUString& aURL )
     }
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL)
 {
     Image aImage;
@@ -1568,9 +1568,9 @@ Image AddonsOptions_Impl::ReadImageFromURL(const OUString& aImageURL)
     return aImage;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUString& aImageId )
 {
     if ( aImageId.isEmpty() )
@@ -1596,9 +1596,9 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUS
     m_aImageManager.insert( ImageManager::value_type( aURL, aImageEntry ));
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUString& aImagesNodeName )
 {
     Sequence< OUString > aImageDataNodeNames = GetPropertyNamesImages( aImagesNodeName );
@@ -1645,9 +1645,9 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUStrin
     return pEntry;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, Sequence< sal_Int8 >& rBitmapDataSeq ) const
 {
     sal_Bool bResult = sal_False;
@@ -1687,9 +1687,9 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const OUStrin
     return lResult;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUString& aPropertyRootNode ) const
 {
     // The URL is automatically set and not read from the configuration.
@@ -1703,9 +1703,9 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUStri
     return lResult;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const OUString& aPropertyRootNode ) const
 {
     Sequence< OUString > lResult( PROPERTYCOUNT_TOOLBARITEM );
@@ -1738,9 +1738,9 @@ Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesStatusbarItem(
     return lResult;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& aPropertyRootNode ) const
 {
     Sequence< OUString > lResult( PROPERTYCOUNT_IMAGES );
@@ -1758,17 +1758,17 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString&
     return lResult;
 }
 
-//*****************************************************************************************************************
+
 //  initialize static member
 //  DON'T DO IT IN YOUR HEADER!
 //  see definition for further information
-//*****************************************************************************************************************
+
 AddonsOptions_Impl*     AddonsOptions::m_pDataContainer = NULL  ;
 sal_Int32               AddonsOptions::m_nRefCount      = 0     ;
 
-//*****************************************************************************************************************
+
 //  constructor
-//*****************************************************************************************************************
+
 AddonsOptions::AddonsOptions()
 {
     // Global access, must be guarded (multithreading!).
@@ -1782,9 +1782,9 @@ AddonsOptions::AddonsOptions()
     }
 }
 
-//*****************************************************************************************************************
+
 //  destructor
-//*****************************************************************************************************************
+
 AddonsOptions::~AddonsOptions()
 {
     // Global access, must be guarded (multithreading!)
@@ -1800,18 +1800,18 @@ AddonsOptions::~AddonsOptions()
     }
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 sal_Bool AddonsOptions::HasAddonsMenu() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->HasAddonsMenu();
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 
 sal_Int32 AddonsOptions::GetAddonsToolBarCount() const
 {
@@ -1819,63 +1819,63 @@ sal_Int32 AddonsOptions::GetAddonsToolBarCount() const
     return m_pDataContainer->GetAddonsToolBarCount();
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenu() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->GetAddonsMenu();
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsMenuBarPart() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->GetAddonsMenuBarPart();
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsToolBarPart( sal_uInt32 nIndex ) const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->GetAddonsToolBarPart( nIndex );
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 const OUString AddonsOptions::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->GetAddonsToolbarResourceName( nIndex );
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsHelpMenu() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->GetAddonsHelpMenu();
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 const MergeMenuInstructionContainer& AddonsOptions::GetMergeMenuInstructions() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->GetMergeMenuInstructions();
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 bool AddonsOptions::GetMergeToolbarInstructions(
     const OUString& rToolbarName,
     MergeToolbarInstructionContainer& rToolbarInstructions ) const
@@ -1891,26 +1891,26 @@ const MergeStatusbarInstructionContainer& AddonsOptions::GetMergeStatusbarInstru
     return m_pDataContainer->GetMergeStatusbarInstructions();
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 Image AddonsOptions::GetImageFromURL( const OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->GetImageFromURL( aURL, bBig, bNoScale );
 }
 
-//*****************************************************************************************************************
+
 //  public method
-//*****************************************************************************************************************
+
 Image AddonsOptions::GetImageFromURL( const OUString& aURL, sal_Bool bBig ) const
 {
     return GetImageFromURL( aURL, bBig, sal_False );
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 Mutex& AddonsOptions::GetOwnStaticMutex()
 {
     // Initialize static mutex only for one time!
@@ -1933,9 +1933,9 @@ Mutex& AddonsOptions::GetOwnStaticMutex()
     return *pMutex;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 IMPL_STATIC_LINK_NOINSTANCE( AddonsOptions, Notify, void*, EMPTYARG )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx
index 68eb2c7f3f57..f22d4e32ffcd 100644
--- a/framework/source/fwe/dispatch/interaction.cxx
+++ b/framework/source/fwe/dispatch/interaction.cxx
@@ -25,7 +25,7 @@ using namespace ::com::sun::star;
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short          declaration of special continuation for filter selection
     @descr          Sometimes filter detection during loading document failed. Then we need a possibility
                     to ask user for his decision. These continuation transport selected filter by user to
diff --git a/framework/source/fwe/helper/documentundoguard.cxx b/framework/source/fwe/helper/documentundoguard.cxx
index 95910a7e7e98..3e1f677c1811 100644
--- a/framework/source/fwe/helper/documentundoguard.cxx
+++ b/framework/source/fwe/helper/documentundoguard.cxx
@@ -26,10 +26,10 @@
 #include <rtl/ref.hxx>
 #include <tools/diagnose_ex.h>
 
-//......................................................................................................................
+
 namespace framework
 {
-//......................................................................................................................
+
 
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
@@ -47,9 +47,9 @@ namespace framework
     using ::com::sun::star::document::UndoManagerEvent;
     using ::com::sun::star::lang::EventObject;
 
-    //==================================================================================================================
+
     //= UndoManagerContextListener
-    //==================================================================================================================
+
     typedef ::cppu::WeakImplHelper1 <   XUndoManagerListener
                                     >   UndoManagerContextListener_Base;
     class UndoManagerContextListener : public UndoManagerContextListener_Base
@@ -194,9 +194,9 @@ namespace framework
         m_documentDisposed = true;
     }
 
-    //==================================================================================================================
+
     //= DocumentUndoGuard_Data
-    //==================================================================================================================
+
     struct DocumentUndoGuard_Data
     {
         Reference< XUndoManager >                       xUndoManager;
@@ -239,9 +239,9 @@ namespace framework
         }
     }
 
-    //==================================================================================================================
+
     //= DocumentUndoGuard
-    //==================================================================================================================
+
 
     DocumentUndoGuard::DocumentUndoGuard( const Reference< XInterface >& i_undoSupplierComponent )
         :m_pData( new DocumentUndoGuard_Data )
@@ -254,8 +254,8 @@ namespace framework
         lcl_restore( *m_pData );
     }
 
-//......................................................................................................................
+
 } // namespace framework
-//......................................................................................................................
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx
index 306b6fd8d2b3..1676fce67b27 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -507,7 +507,7 @@ void TitleHelper::impl_updateTitleForFrame (const css::uno::Reference< css::fram
         impl_sendTitleChangedEvent ();
 }
 
-//*****************************************************************************************************************
+
 void TitleHelper::impl_appendComponentTitle (      OUStringBuffer&                       sTitle    ,
                                              const css::uno::Reference< css::uno::XInterface >& xComponent)
 {
@@ -518,7 +518,7 @@ void TitleHelper::impl_appendComponentTitle (      OUStringBuffer&
         sTitle.append (xTitle->getTitle ());
 }
 
-//*****************************************************************************************************************
+
 void TitleHelper::impl_appendProductName (OUStringBuffer& sTitle)
 {
     OUString name(utl::ConfigManager::getProductName());
@@ -530,7 +530,7 @@ void TitleHelper::impl_appendProductName (OUStringBuffer& sTitle)
     }
 }
 
-//*****************************************************************************************************************
+
 void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle)
 {
     // SYNCHRONIZED ->
@@ -563,7 +563,7 @@ void TitleHelper::impl_appendModuleName (OUStringBuffer& sTitle)
     {}
 }
 
-//*****************************************************************************************************************
+
 #ifdef DBG_UTIL
 void TitleHelper::impl_appendDebugVersion (OUStringBuffer& sTitle)
 {
diff --git a/framework/source/fwe/helper/undomanagerhelper.cxx b/framework/source/fwe/helper/undomanagerhelper.cxx
index 129dfe517bd6..51b5a1818b8d 100644
--- a/framework/source/fwe/helper/undomanagerhelper.cxx
+++ b/framework/source/fwe/helper/undomanagerhelper.cxx
@@ -34,10 +34,10 @@
 #include <queue>
 #include <boost/function.hpp>
 
-//......................................................................................................................
+
 namespace framework
 {
-//......................................................................................................................
+
 
     using ::com::sun::star::uno::Reference;
     using ::com::sun::star::uno::XInterface;
@@ -65,9 +65,9 @@ namespace framework
     using ::com::sun::star::util::XModifyListener;
     using ::svl::IUndoManager;
 
-    //==================================================================================================================
+
     //= UndoActionWrapper
-    //==================================================================================================================
+
     class UndoActionWrapper : public SfxUndoAction
     {
     public:
@@ -141,9 +141,9 @@ namespace framework
         return false;
     }
 
-    //==================================================================================================================
+
     //= UndoManagerRequest
-    //==================================================================================================================
+
     class UndoManagerRequest : public ::comphelper::AnyEvent
     {
     public:
@@ -197,9 +197,9 @@ namespace framework
 
 
 
-    //==================================================================================================================
+
     //= UndoManagerHelper_Impl
-    //==================================================================================================================
+
     class UndoManagerHelper_Impl : public SfxUndoListener
     {
     private:
@@ -241,13 +241,13 @@ namespace framework
         {
         }
 
-        //..............................................................................................................
+
         IUndoManager& getUndoManager() const
         {
             return m_rUndoManagerImplementation.getImplUndoManager();
         }
 
-        //..............................................................................................................
+
         Reference< XUndoManager > getXUndoManager() const
         {
             return m_rUndoManagerImplementation.getThis();
@@ -921,9 +921,9 @@ namespace framework
         // TODO: do we need to care? Or is this the responsibility of our owner?
     }
 
-    //==================================================================================================================
+
     //= UndoManagerHelper
-    //==================================================================================================================
+
 
     UndoManagerHelper::UndoManagerHelper( IUndoManagerImplementation& i_undoManagerImpl )
         :m_pImpl( new UndoManagerHelper_Impl( i_undoManagerImpl ) )
@@ -1032,7 +1032,7 @@ namespace framework
 
     namespace
     {
-        //..............................................................................................................
+
         OUString lcl_getCurrentActionTitle( UndoManagerHelper_Impl& i_impl, const bool i_undo )
         {
             // SYNCHRONIZED --->
@@ -1054,7 +1054,7 @@ namespace framework
             // <--- SYNCHRONIZED
         }
 
-        //..............................................................................................................
+
         Sequence< OUString > lcl_getAllActionTitles( UndoManagerHelper_Impl& i_impl, const bool i_undo )
         {
             // SYNCHRONIZED --->
@@ -1170,8 +1170,8 @@ namespace framework
             m_pImpl->removeModifyListener( i_listener );
     }
 
-//......................................................................................................................
+
 } // namespace framework
-//......................................................................................................................
+
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/framework/source/fwi/threadhelp/lockhelper.cxx b/framework/source/fwi/threadhelp/lockhelper.cxx
index 8a7edefc8233..b0361d8a0f77 100644
--- a/framework/source/fwi/threadhelp/lockhelper.cxx
+++ b/framework/source/fwi/threadhelp/lockhelper.cxx
@@ -27,7 +27,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      use ctor to initialize instance
 
     @seealso    class ReadGuard
@@ -55,7 +55,7 @@ LockHelper::LockHelper( comphelper::SolarMutex* pSolarMutex )
     }
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      default dtor to release safed pointer
     @descr      We have created dynamical mutex- or lock-member ... or we hold a pointer to external objects.
                 We must release it!
@@ -85,7 +85,7 @@ LockHelper::~LockHelper()
     }
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  IMutex
     @short      set an exclusiv lock
     @descr      We must match this lock call with current set lock type and used lock member.
@@ -107,7 +107,7 @@ void LockHelper::acquire()
     m_pSolarMutex->acquire();
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  IMutex
     @short      release exclusiv lock
     @descr      We must match this unlock call with current set lock type and used lock member.
@@ -129,7 +129,7 @@ void LockHelper::release()
     m_pSolarMutex->release();
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  IRWLock
     @short      set lock for reading
     @descr      A guard should call this method to acquire read access on your member.
@@ -150,7 +150,7 @@ void LockHelper::acquireReadAccess()
     m_pSolarMutex->acquire();
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  IRWLock
     @short      reset lock for reading
     @descr      A guard should call this method to release read access on your member.
@@ -170,7 +170,7 @@ void LockHelper::releaseReadAccess()
     m_pSolarMutex->release();
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  IRWLock
     @short      set lock for writing
     @descr      A guard should call this method to acquire write access on your member.
@@ -192,7 +192,7 @@ void LockHelper::acquireWriteAccess()
     m_pSolarMutex->acquire();
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  IRWLock
     @short      reset lock for writing
     @descr      A guard should call this method to release write access on your member.
@@ -212,7 +212,7 @@ void LockHelper::releaseWriteAccess()
     m_pSolarMutex->release();
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  IRWLock
     @short      downgrade a write access to a read access
     @descr      A guard should call this method to change a write to a read access.
@@ -240,7 +240,7 @@ void LockHelper::downgradeWriteAccess()
     // Not supported for mutex!
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      return a reference to a static lock helper
     @descr      Sometimes we need the global mutex or rw-lock! (e.g. in our own static methods)
                 But it's not a good idea to use these global one very often ...
@@ -280,7 +280,7 @@ LockHelper& LockHelper::getGlobalLock()
     return *pLock;
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      return a reference to shared mutex member
     @descr      Sometimes we need a osl-mutex for sharing with our uno helper ...
                 What can we do?
diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx
index 87e67b1fded2..bd13359e4a5c 100644
--- a/framework/source/fwi/threadhelp/transactionmanager.cxx
+++ b/framework/source/fwi/threadhelp/transactionmanager.cxx
@@ -26,7 +26,7 @@
 
 namespace framework{
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      standard ctor
     @descr      Initialize instance with right start values for correct working.
 
@@ -44,7 +44,7 @@ TransactionManager::TransactionManager()
     m_aBarrier.open();
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      standard dtor
     @descr      -
 
@@ -59,7 +59,7 @@ TransactionManager::~TransactionManager()
 {
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @interface  ITransactionManager
     @short      set new working mode
     @descr      These implementation knows for states of working: E_INIT, E_WORK, E_CLOSING, E_CLOSE
@@ -119,7 +119,7 @@ void  TransactionManager::setWorkingMode( EWorkingMode eMode )
     }
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @interface  ITransactionManager
     @short      get current working mode
     @descr      If you stand in your close() or init() method ... but don't know
@@ -165,7 +165,7 @@ EWorkingMode TransactionManager::getWorkingMode() const
     return m_eWorkingMode;
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @interface  ITransactionManager
     @short      start new transaction
     @descr      A guard should use this method to start a new transaction. He should looks for rejected
@@ -207,7 +207,7 @@ void  TransactionManager::registerTransaction( EExceptionMode eMode, ERejectReas
     }
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @interface  ITransactionManager
     @short      finish transaction
     @descr      A guard should call this method to release current transaction.
@@ -236,7 +236,7 @@ void  TransactionManager::unregisterTransaction() throw( css::uno::RuntimeExcept
     }
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @interface  ITransactionManager
     @short      look for rejected calls
     @descr      Sometimes user need a possibility to get information about rejected calls
@@ -269,7 +269,7 @@ sal_Bool  TransactionManager::isCallRejected( ERejectReason& eReason ) const
     return( eReason!=E_NOREASON );
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      throw any exceptions for rejected calls
     @descr      If a user wishes to use our automatic exception mode we use this impl-method.
                 We check all combinations of eReason and eExceptionMode and throw correct exception with some
diff --git a/framework/source/fwi/uielement/itemcontainer.cxx b/framework/source/fwi/uielement/itemcontainer.cxx
index 154c2432cf91..6871a758ad1d 100644
--- a/framework/source/fwi/uielement/itemcontainer.cxx
+++ b/framework/source/fwi/uielement/itemcontainer.cxx
@@ -33,9 +33,9 @@ const char WRONG_TYPE_EXCEPTION[] = "Type must be com::sun::star::uno::Sequence<
 namespace framework
 {
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider
-//*****************************************************************************************************************
+
 
 ItemContainer::ItemContainer( const ShareableMutex& rMutex ) :
     m_aShareMutex( rMutex )
diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx
index 47fd34fd6041..4b4271fffdbe 100644
--- a/framework/source/helper/dockingareadefaultacceptor.cxx
+++ b/framework/source/helper/dockingareadefaultacceptor.cxx
@@ -35,9 +35,9 @@ using namespace ::com::sun::star::uno           ;
 using namespace ::cppu                          ;
 using namespace ::osl                           ;
 
-//*****************************************************************************************************************
+
 //  constructor
-//*****************************************************************************************************************
+
 DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const   css::uno::Reference< XFrame >&      xOwner  )
         //  Init baseclasses first
         :   ThreadHelpBase  ( &Application::GetSolarMutex() )
@@ -46,16 +46,15 @@ DockingAreaDefaultAcceptor::DockingAreaDefaultAcceptor( const   css::uno::Refere
 {
 }
 
-//*****************************************************************************************************************
+
 //  destructor
-//*****************************************************************************************************************
+
 DockingAreaDefaultAcceptor::~DockingAreaDefaultAcceptor()
 {
 }
 
-//*****************************************************************************************************************
+
 //  XDockingAreaAcceptor
-//*****************************************************************************************************************
 css::uno::Reference< css::awt::XWindow > SAL_CALL DockingAreaDefaultAcceptor::getContainerWindow() throw (css::uno::RuntimeException, std::exception)
 {
     // Ready for multithreading
diff --git a/framework/source/helper/ocomponentaccess.cxx b/framework/source/helper/ocomponentaccess.cxx
index 6bc4685a8cb3..142758d2e1e8 100644
--- a/framework/source/helper/ocomponentaccess.cxx
+++ b/framework/source/helper/ocomponentaccess.cxx
@@ -36,9 +36,9 @@ using namespace ::cppu                          ;
 using namespace ::osl                           ;
 using namespace ::rtl                           ;
 
-//*****************************************************************************************************************
+
 //  constructor
-//*****************************************************************************************************************
+
 OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwner )
         //  Init baseclasses first
         :   ThreadHelpBase  ( &Application::GetSolarMutex() )
@@ -49,16 +49,15 @@ OComponentAccess::OComponentAccess( const css::uno::Reference< XDesktop >& xOwne
     SAL_WARN_IF( !impldbg_checkParameter_OComponentAccessCtor( xOwner ), "fwk", "OComponentAccess::OComponentAccess(): Invalid parameter detected!" );
 }
 
-//*****************************************************************************************************************
+
 //  destructor
-//*****************************************************************************************************************
+
 OComponentAccess::~OComponentAccess()
 {
 }
 
-//*****************************************************************************************************************
+
 //  XEnumerationAccess
-//*****************************************************************************************************************
 css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
@@ -86,9 +85,8 @@ css::uno::Reference< XEnumeration > SAL_CALL OComponentAccess::createEnumeration
     return xReturn;
 }
 
-//*****************************************************************************************************************
+
 //  XElementAccess
-//*****************************************************************************************************************
 Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::exception )
 {
     // Elements in list an enumeration are components!
@@ -96,9 +94,8 @@ Type SAL_CALL OComponentAccess::getElementType() throw( RuntimeException, std::e
     return ::getCppuType((const css::uno::Reference< XComponent >*)NULL);
 }
 
-//*****************************************************************************************************************
+
 //  XElementAccess
-//*****************************************************************************************************************
 sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
@@ -119,9 +116,9 @@ sal_Bool SAL_CALL OComponentAccess::hasElements() throw( RuntimeException, std::
     return bReturn;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 void OComponentAccess::impl_collectAllChildComponents(  const   css::uno::Reference< XFramesSupplier >&         xNode           ,
                                                                  Sequence< css::uno::Reference< XComponent > >& seqComponents   )
 {
@@ -153,9 +150,9 @@ void OComponentAccess::impl_collectAllChildComponents(  const   css::uno::Refere
     // ... otherwise break a recursive path and go back at current stack!
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( const css::uno::Reference< XFrame >& xFrame ) const
 {
     // Set default return value, if method failed.
@@ -200,7 +197,7 @@ css::uno::Reference< XComponent > OComponentAccess::impl_getFrameComponent( cons
         But ... look for right testing! See using of this methods!
 -----------------------------------------------------------------------------------------------------------------*/
 
-//*****************************************************************************************************************
+
 sal_Bool OComponentAccess::impldbg_checkParameter_OComponentAccessCtor( const   css::uno::Reference< XDesktop >&      xOwner  )
 {
     return xOwner.is();
diff --git a/framework/source/helper/ocomponentenumeration.cxx b/framework/source/helper/ocomponentenumeration.cxx
index 2c1f9e1b5db2..9342deec2561 100644
--- a/framework/source/helper/ocomponentenumeration.cxx
+++ b/framework/source/helper/ocomponentenumeration.cxx
@@ -32,9 +32,9 @@ using namespace ::cppu                          ;
 using namespace ::osl                           ;
 using namespace ::rtl                           ;
 
-//*****************************************************************************************************************
+
 //  constructor
-//*****************************************************************************************************************
+
 OComponentEnumeration::OComponentEnumeration( const Sequence< css::uno::Reference< XComponent > >& seqComponents )
         //  Init baseclasses first
         //  Attention:
@@ -52,18 +52,17 @@ OComponentEnumeration::OComponentEnumeration( const Sequence< css::uno::Referenc
     SAL_WARN_IF( !impldbg_checkParameter_OComponentEnumerationCtor( seqComponents ), "fwk", "OComponentEnumeration::OComponentEnumeration(): Invalid parameter detected!" );
 }
 
-//*****************************************************************************************************************
+
 //  destructor
-//*****************************************************************************************************************
+
 OComponentEnumeration::~OComponentEnumeration()
 {
     // Reset instance, free memory ....
     impl_resetObject();
 }
 
-//*****************************************************************************************************************
+
 //  XEventListener
-//*****************************************************************************************************************
 void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
@@ -78,9 +77,8 @@ void SAL_CALL OComponentEnumeration::disposing( const EventObject& aEvent ) thro
     impl_resetObject();
 }
 
-//*****************************************************************************************************************
+
 //  XEnumeration
-//*****************************************************************************************************************
 sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
@@ -93,9 +91,9 @@ sal_Bool SAL_CALL OComponentEnumeration::hasMoreElements() throw( RuntimeExcepti
     return ( m_nPosition < (sal_uInt32)(m_seqComponents.getLength()) );
 }
 
-//*****************************************************************************************************************
+
 //  XEnumeration
-//*****************************************************************************************************************
+
 Any SAL_CALL OComponentEnumeration::nextElement() throw(    NoSuchElementException  ,
                                                              WrappedTargetException ,
                                                             RuntimeException, std::exception        )
@@ -120,9 +118,9 @@ Any SAL_CALL OComponentEnumeration::nextElement() throw(    NoSuchElementExcepti
     return aComponent;
 }
 
-//*****************************************************************************************************************
+
 //  proteced method
-//*****************************************************************************************************************
+
 void OComponentEnumeration::impl_resetObject()
 {
     // Attention:
@@ -154,7 +152,7 @@ void OComponentEnumeration::impl_resetObject()
         But ... look for right testing! See using of this methods!
 -----------------------------------------------------------------------------------------------------------------*/
 
-//*****************************************************************************************************************
+
 // An empty list is allowed ... hasMoreElements() will return false then!
 sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor( const Sequence< css::uno::Reference< XComponent > >& seqComponents )
 {
@@ -171,7 +169,7 @@ sal_Bool OComponentEnumeration::impldbg_checkParameter_OComponentEnumerationCtor
     return bOK ;
 }
 
-//*****************************************************************************************************************
+
 sal_Bool OComponentEnumeration::impldbg_checkParameter_disposing( const EventObject& aEvent )
 {
     return aEvent.Source.is();
diff --git a/framework/source/helper/oframes.cxx b/framework/source/helper/oframes.cxx
index 4ba1b88f1d75..f0ce0c24611c 100644
--- a/framework/source/helper/oframes.cxx
+++ b/framework/source/helper/oframes.cxx
@@ -37,9 +37,9 @@ using namespace ::osl                           ;
 using namespace ::std                           ;
 
 
-//*****************************************************************************************************************
+
 //  constructor
-//*****************************************************************************************************************
+
 OFrames::OFrames( const   css::uno::Reference< XFrame >&              xOwner          ,
                             FrameContainer*                     pFrameContainer )
         //  Init baseclasses first
@@ -54,18 +54,17 @@ OFrames::OFrames( const   css::uno::Reference< XFrame >&              xOwner
     SAL_WARN_IF( !impldbg_checkParameter_OFramesCtor( xOwner, pFrameContainer ), "fwk", "OFrames::OFrames(): Invalid parameter detected!" );
 }
 
-//*****************************************************************************************************************
+
 //  (proteced!) destructor
-//*****************************************************************************************************************
+
 OFrames::~OFrames()
 {
     // Reset instance, free memory ....
     impl_resetObject();
 }
 
-//*****************************************************************************************************************
+
 //  XFrames
-//*****************************************************************************************************************
 void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
@@ -89,9 +88,8 @@ void SAL_CALL OFrames::append( const css::uno::Reference< XFrame >& xFrame ) thr
     SAL_WARN_IF( !xOwner.is(), "fwk", "OFrames::append():Our owner is dead - you can't append any frames ...!" );
 }
 
-//*****************************************************************************************************************
+
 //  XFrames
-//*****************************************************************************************************************
 void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
@@ -116,9 +114,8 @@ void SAL_CALL OFrames::remove( const css::uno::Reference< XFrame >& xFrame ) thr
     SAL_WARN_IF( !xOwner.is(), "fwk", "OFrames::remove(): Our owner is dead - you can't remove any frames ...!" );
 }
 
-//*****************************************************************************************************************
+
 //  XFrames
-//*****************************************************************************************************************
 Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int32 nSearchFlags ) throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
@@ -223,9 +220,8 @@ Sequence< css::uno::Reference< XFrame > > SAL_CALL OFrames::queryFrames( sal_Int
     return seqFrames;
 }
 
-//*****************************************************************************************************************
+
 //  XIndexAccess
-//*****************************************************************************************************************
 sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
@@ -247,9 +243,9 @@ sal_Int32 SAL_CALL OFrames::getCount() throw( RuntimeException, std::exception )
     return nCount;
 }
 
-//*****************************************************************************************************************
+
 //  XIndexAccess
-//*****************************************************************************************************************
+
 Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsException   ,
                                                             WrappedTargetException      ,
                                                             RuntimeException, std::exception            )
@@ -279,18 +275,16 @@ Any SAL_CALL OFrames::getByIndex( sal_Int32 nIndex ) throw( IndexOutOfBoundsExce
     return aReturnValue;
 }
 
-//*****************************************************************************************************************
+
 //  XElementAccess
-//*****************************************************************************************************************
 Type SAL_CALL OFrames::getElementType() throw( RuntimeException, std::exception )
 {
     // This "container" support XFrame-interfaces only!
     return ::getCppuType( (const css::uno::Reference< XFrame >*)NULL );
 }
 
-//*****************************************************************************************************************
+
 //  XElementAccess
-//*****************************************************************************************************************
 sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception )
 {
     // Ready for multithreading
@@ -314,9 +308,9 @@ sal_Bool SAL_CALL OFrames::hasElements() throw( RuntimeException, std::exception
     return bHasElements;
 }
 
-//*****************************************************************************************************************
+
 //  proteced method
-//*****************************************************************************************************************
+
 void OFrames::impl_resetObject()
 {
     // Attention:
@@ -331,9 +325,9 @@ void OFrames::impl_resetObject()
     m_pFrameContainer = NULL;
 }
 
-//*****************************************************************************************************************
+
 //  private method
-//*****************************************************************************************************************
+
 void OFrames::impl_appendSequence(          Sequence< css::uno::Reference< XFrame > >&  seqDestination  ,
                                      const  Sequence< css::uno::Reference< XFrame > >&  seqSource       )
 {
@@ -384,7 +378,7 @@ void OFrames::impl_appendSequence(          Sequence< css::uno::Reference< XFram
         But ... look for right testing! See using of this methods!
 -----------------------------------------------------------------------------------------------------------------*/
 
-//*****************************************************************************************************************
+
 // An instance of this class can only work with valid initialization.
 // We share the mutex with ouer owner class, need a valid factory to instanciate new services and
 // use the access to ouer owner for some operations.
@@ -394,7 +388,7 @@ sal_Bool OFrames::impldbg_checkParameter_OFramesCtor(   const   css::uno::Refere
     return xOwner.is() && pFrameContainer != 0;
 }
 
-//*****************************************************************************************************************
+
 // Its only allowed to add valid references to container.
 // AND - alle frames must support XFrames-interface!
 sal_Bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFrame >& xFrame )
@@ -402,7 +396,7 @@ sal_Bool OFrames::impldbg_checkParameter_append( const css::uno::Reference< XFra
     return xFrame.is();
 }
 
-//*****************************************************************************************************************
+
 // Its only allowed to add valid references to container...
 // ... => You can only delete valid references!
 sal_Bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFrame >& xFrame )
@@ -410,7 +404,7 @@ sal_Bool OFrames::impldbg_checkParameter_remove( const css::uno::Reference< XFra
     return xFrame.is();
 }
 
-//*****************************************************************************************************************
+
 // A search for frames must initiate with right flags.
 // Some one are superflous and not supported yet. But here we control only the range of incoming parameter!
 sal_Bool OFrames::impldbg_checkParameter_queryFrames( sal_Int32 nSearchFlags )
diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx
index 634583b52ea6..7d186140a724 100644
--- a/framework/source/helper/persistentwindowstate.cxx
+++ b/framework/source/helper/persistentwindowstate.cxx
@@ -44,7 +44,7 @@
 namespace framework{
 
 
-//*****************************************************************************************************************
+
 PersistentWindowState::PersistentWindowState(const css::uno::Reference< css::uno::XComponentContext >& xContext)
     : ThreadHelpBase          (&Application::GetSolarMutex())
     , m_xContext              (xContext                     )
@@ -52,12 +52,12 @@ PersistentWindowState::PersistentWindowState(const css::uno::Reference< css::uno
 {
 }
 
-//*****************************************************************************************************************
+
 PersistentWindowState::~PersistentWindowState()
 {
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
     throw(css::uno::Exception       ,
           css::uno::RuntimeException, std::exception)
@@ -88,7 +88,7 @@ void SAL_CALL PersistentWindowState::initialize(const css::uno::Sequence< css::u
     xFrame->addFrameActionListener(this);
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEvent& aEvent)
     throw(css::uno::RuntimeException, std::exception)
 {
@@ -149,14 +149,14 @@ void SAL_CALL PersistentWindowState::frameAction(const css::frame::FrameActionEv
     }
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL PersistentWindowState::disposing(const css::lang::EventObject&)
     throw(css::uno::RuntimeException, std::exception)
 {
     // nothing todo here - because we hold the frame as weak reference only
 }
 
-//*****************************************************************************************************************
+
 OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                                              const css::uno::Reference< css::frame::XFrame >&              xFrame)
 {
@@ -177,7 +177,7 @@ OUString PersistentWindowState::implst_identifyModule(const css::uno::Reference<
     return sModuleName;
 }
 
-//*****************************************************************************************************************
+
 OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                                                        const OUString&                                    sModuleName)
 {
@@ -208,7 +208,7 @@ OUString PersistentWindowState::implst_getWindowStateFromConfig(const css::uno::
     return sWindowState;
 }
 
-//*****************************************************************************************************************
+
 void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Reference< css::uno::XComponentContext >& rxContext,
                                                           const OUString&                                    sModuleName ,
                                                           const OUString&                                    sWindowState)
@@ -237,7 +237,7 @@ void PersistentWindowState::implst_setWindowStateOnConfig(const css::uno::Refere
         {}
 }
 
-//*****************************************************************************************************************
+
 OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::Reference< css::awt::XWindow >& xWindow)
 {
     OUString sWindowState;
@@ -267,7 +267,7 @@ OUString PersistentWindowState::implst_getWindowStateFromWindow(const css::uno::
 }
 
 
-//*********************************************************************************************************
+
 void PersistentWindowState::implst_setWindowStateOnWindow(const css::uno::Reference< css::awt::XWindow >& xWindow     ,
                                                           const OUString&                          sWindowState)
 {
diff --git a/framework/source/helper/statusindicator.cxx b/framework/source/helper/statusindicator.cxx
index 8585679d214f..2a94ebe09e5d 100644
--- a/framework/source/helper/statusindicator.cxx
+++ b/framework/source/helper/statusindicator.cxx
@@ -28,19 +28,19 @@
 namespace framework{
 
 
-//***********************************************
+
 StatusIndicator::StatusIndicator(StatusIndicatorFactory* pFactory)
     : ThreadHelpBase     (        )
     , m_xFactory         (pFactory)
 {
 }
 
-//***********************************************
+
 StatusIndicator::~StatusIndicator()
 {
 }
 
-//***********************************************
+
 void SAL_CALL StatusIndicator::start(const OUString& sText ,
                                            sal_Int32        nRange)
     throw(css::uno::RuntimeException, std::exception)
@@ -57,7 +57,7 @@ void SAL_CALL StatusIndicator::start(const OUString& sText ,
     }
 }
 
-//***********************************************
+
 void SAL_CALL StatusIndicator::end()
     throw(css::uno::RuntimeException, std::exception)
 {
@@ -73,7 +73,7 @@ void SAL_CALL StatusIndicator::end()
     }
 }
 
-//***********************************************
+
 void SAL_CALL StatusIndicator::reset()
     throw(css::uno::RuntimeException, std::exception)
 {
@@ -89,7 +89,7 @@ void SAL_CALL StatusIndicator::reset()
     }
 }
 
-//***********************************************
+
 void SAL_CALL StatusIndicator::setText(const OUString& sText)
     throw(css::uno::RuntimeException, std::exception)
 {
@@ -105,7 +105,7 @@ void SAL_CALL StatusIndicator::setText(const OUString& sText)
     }
 }
 
-//***********************************************
+
 void SAL_CALL StatusIndicator::setValue(sal_Int32 nValue)
     throw(css::uno::RuntimeException, std::exception)
 {
diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx
index 538b789d8a7e..3e713ca31a54 100644
--- a/framework/source/helper/tagwindowasmodified.cxx
+++ b/framework/source/helper/tagwindowasmodified.cxx
@@ -42,18 +42,18 @@
 namespace framework{
 
 
-//*****************************************************************************************************************
+
 TagWindowAsModified::TagWindowAsModified()
     : ThreadHelpBase          (&Application::GetSolarMutex())
 {
 }
 
-//*****************************************************************************************************************
+
 TagWindowAsModified::~TagWindowAsModified()
 {
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
     throw(css::uno::Exception       ,
           css::uno::RuntimeException, std::exception)
@@ -76,7 +76,7 @@ void SAL_CALL TagWindowAsModified::initialize(const css::uno::Sequence< css::uno
     impl_update (xFrame);
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent)
     throw(css::uno::RuntimeException, std::exception)
 {
@@ -116,7 +116,7 @@ void SAL_CALL TagWindowAsModified::modified(const css::lang::EventObject& aEvent
     // <- SYNCHRONIZED
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEvent& aEvent)
     throw(css::uno::RuntimeException, std::exception)
 {
@@ -142,7 +142,7 @@ void SAL_CALL TagWindowAsModified::frameAction(const css::frame::FrameActionEven
     impl_update (xFrame);
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEvent)
     throw(css::uno::RuntimeException, std::exception)
 {
@@ -173,7 +173,7 @@ void SAL_CALL TagWindowAsModified::disposing(const css::lang::EventObject& aEven
     // <- SAFE ----------------------------------
 }
 
-//*****************************************************************************************************************
+
 void TagWindowAsModified::impl_update (const css::uno::Reference< css::frame::XFrame >& xFrame)
 {
     if ( ! xFrame.is ())
diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx
index 188d09512bdc..5a95a936e504 100644
--- a/framework/source/helper/titlebarupdate.cxx
+++ b/framework/source/helper/titlebarupdate.cxx
@@ -53,7 +53,7 @@ static const ::sal_Int32 INVALID_ICON_ID = -1;
 static const ::sal_Int32 DEFAULT_ICON_ID =  0;
 
 
-//*****************************************************************************************************************
+
 TitleBarUpdate::TitleBarUpdate(const css::uno::Reference< css::uno::XComponentContext >& xContext)
     : ThreadHelpBase          (&Application::GetSolarMutex())
     , m_xContext              (xContext                     )
@@ -61,12 +61,12 @@ TitleBarUpdate::TitleBarUpdate(const css::uno::Reference< css::uno::XComponentCo
 {
 }
 
-//*****************************************************************************************************************
+
 TitleBarUpdate::~TitleBarUpdate()
 {
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any >& lArguments)
     throw(css::uno::Exception       ,
           css::uno::RuntimeException, std::exception)
@@ -101,7 +101,7 @@ void SAL_CALL TitleBarUpdate::initialize(const css::uno::Sequence< css::uno::Any
         xBroadcaster->addTitleChangeListener (this);
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aEvent)
     throw(css::uno::RuntimeException, std::exception)
 {
@@ -117,14 +117,14 @@ void SAL_CALL TitleBarUpdate::frameAction(const css::frame::FrameActionEvent& aE
     }
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL TitleBarUpdate::titleChanged(const css::frame::TitleChangedEvent& /* aEvent */)
     throw (css::uno::RuntimeException, std::exception)
 {
     impl_forceUpdate ();
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL TitleBarUpdate::disposing(const css::lang::EventObject&)
     throw(css::uno::RuntimeException, std::exception)
 {
@@ -209,7 +209,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
 }
 
 
-//*****************************************************************************************************************
+
 ::sal_Bool TitleBarUpdate::implst_getModuleInfo(const css::uno::Reference< css::frame::XFrame >& xFrame,
                                                       TModuleInfo&                               rInfo )
 {
@@ -244,7 +244,7 @@ void TitleBarUpdate::impl_updateApplicationID(const css::uno::Reference< css::fr
     return sal_False;
 }
 
-//*****************************************************************************************************************
+
 void TitleBarUpdate::impl_forceUpdate()
 {
     // SYNCHRONIZED ->
@@ -269,7 +269,7 @@ void TitleBarUpdate::impl_forceUpdate()
 #endif
 }
 
-//*****************************************************************************************************************
+
 void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFrame >& xFrame)
 {
     css::uno::Reference< css::frame::XController > xController = xFrame->getController      ();
@@ -341,7 +341,7 @@ void TitleBarUpdate::impl_updateIcon(const css::uno::Reference< css::frame::XFra
     // <- VCL SYNCHRONIZED
 }
 
-//*****************************************************************************************************************
+
 void TitleBarUpdate::impl_updateTitle(const css::uno::Reference< css::frame::XFrame >& xFrame)
 {
     // no window ... no chance to set any title -> return
diff --git a/framework/source/helper/wakeupthread.cxx b/framework/source/helper/wakeupthread.cxx
index 67977728290c..08fdc66fcf2d 100644
--- a/framework/source/helper/wakeupthread.cxx
+++ b/framework/source/helper/wakeupthread.cxx
@@ -28,14 +28,14 @@
 namespace framework{
 
 
-//***********************************************
+
 WakeUpThread::WakeUpThread(const css::uno::Reference< css::util::XUpdatable >& xListener)
     : ThreadHelpBase(         )
     , m_xListener   (xListener)
 {
 }
 
-//***********************************************
+
 void SAL_CALL WakeUpThread::run()
 {
     ::osl::Condition aSleeper;
@@ -60,7 +60,7 @@ void SAL_CALL WakeUpThread::run()
     }
 }
 
-//***********************************************
+
 void SAL_CALL WakeUpThread::onTerminated()
 {
     delete this;
diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx
index 63986d98a41f..341cc85b7230 100644
--- a/framework/source/inc/accelerators/acceleratorcache.hxx
+++ b/framework/source/inc/accelerators/acceleratorcache.hxx
@@ -28,13 +28,13 @@
 
 #include <comphelper/sequenceasvector.hxx>
 
-//__________________________________________
+
 // definition
 
 namespace framework
 {
 
-//__________________________________________
+
 /**
     @short  implements a cache for any accelerator configuration.
 
@@ -46,19 +46,19 @@ namespace framework
  */
 class AcceleratorCache : public ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ...
 {
-    //______________________________________
+
     // const, types
 
     public:
 
-        //---------------------------------------
+
         /** TODO document me
             commands -> keys
         */
         typedef ::comphelper::SequenceAsVector< css::awt::KeyEvent > TKeyList;
         typedef BaseHash< TKeyList > TCommand2Keys;
 
-        //---------------------------------------
+
         /** TODO document me
             keys -> commands
         */
@@ -67,40 +67,40 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
                                  KeyEventHashCode   ,
                                  KeyEventEqualsFunc > TKey2Commands;
 
-    //______________________________________
+
     // member
 
     private:
 
-        //---------------------------------------
+
         /** map commands to keys in relation 1:n.
             First key is interpreted as preferred one! */
         TCommand2Keys m_lCommand2Keys;
 
-        //---------------------------------------
+
         /** map keys to commands in relation 1:1. */
         TKey2Commands m_lKey2Commands;
 
-    //______________________________________
+
     // interface
 
     public:
 
-        //---------------------------------------
+
         /** @short  creates a new - but empty - cache instance. */
         AcceleratorCache();
 
-        //---------------------------------------
+
         /** @short  make a copy of this cache.
             @descr  Used for the copy-on-write feature.
         */
         AcceleratorCache(const AcceleratorCache& rCopy);
 
-        //---------------------------------------
+
         /** @short  does nothing real. */
         virtual ~AcceleratorCache();
 
-        //---------------------------------------
+
         /** @short  write changes back to the original container.
 
             @param  rCopy
@@ -109,11 +109,11 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
           */
         virtual void takeOver(const AcceleratorCache& rCopy);
 
-        //---------------------------------------
+
         /** TODO document me */
         AcceleratorCache& operator=(const AcceleratorCache& rCopy);
 
-        //---------------------------------------
+
         /** @short  checks if the specified key exists.
 
             @param  aKey
@@ -125,11 +125,11 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
         virtual sal_Bool hasKey(const css::awt::KeyEvent& aKey) const;
         virtual sal_Bool hasCommand(const OUString& sCommand) const;
 
-        //---------------------------------------
+
         /** TODO document me */
         virtual TKeyList getAllKeys() const;
 
-        //---------------------------------------
+
         /** @short  add a new or change an existing key-command pair
                     of this container.
 
@@ -142,7 +142,7 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
         virtual void setKeyCommandPair(const css::awt::KeyEvent& aKey    ,
                                        const OUString&    sCommand);
 
-        //---------------------------------------
+
         /** @short  returns the list of keys, which are registered
                     for this command.
 
@@ -154,11 +154,11 @@ class AcceleratorCache : public ThreadHelpBase // attention! Must be the first b
           */
         virtual TKeyList getKeysByCommand(const OUString& sCommand) const;
 
-        //---------------------------------------
+
         /** TODO */
         virtual OUString getCommandByKey(const css::awt::KeyEvent& aKey) const;
 
-        //---------------------------------------
+
         /** TODO */
         virtual void removeKey(const css::awt::KeyEvent& aKey);
         virtual void removeCommand(const OUString& sCommand);
diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
index 535f87358c91..179492564a06 100644
--- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx
+++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx
@@ -51,7 +51,7 @@
 #include <cppuhelper/implbase4.hxx>
 #include <salhelper/singletonref.hxx>
 
-//__________________________________________
+
 // definition
 
 namespace framework
@@ -65,7 +65,7 @@ const char CFG_ENTRY_MODULES[] = "Modules";
     in combination with the salhelper::SingletonRef mechanism! */
 typedef PresetHandler AcceleratorPresets;
 
-//__________________________________________
+
 /**
     implements a read/write access to the accelerator configuration.
  */
@@ -77,17 +77,17 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase,
                                                                                              //    css::ui::XUIConfigurationStorage
                                                                                              //    css::ui::XUIConfiguration
 {
-    //______________________________________
+
     // member
 
     protected:
 
-        //---------------------------------------
+
         /** the global uno service manager.
         Must be used to create own needed services. */
         css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
-        //---------------------------------------
+
         /** used to:
         i  ) copy configuration files from the share to the user layer
         ii ) provide access to these config files
@@ -95,15 +95,15 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase,
         iv ) provide commit for changes. */
         PresetHandler m_aPresetHandler;
 
-        //---------------------------------------
+
         /** contains the cached configuration data */
         AcceleratorCache m_aReadCache;
 
-        //---------------------------------------
+
         /** used to implement the copy on write pattern! */
         AcceleratorCache* m_pWriteCache;
 
-        //______________________________________
+
         // native interface!
 
     public:
@@ -111,7 +111,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase,
         XMLBasedAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext);
         virtual ~XMLBasedAcceleratorConfiguration(                                                                    );
 
-        //______________________________________
+
         // uno interface!
 
     public:
@@ -194,12 +194,12 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase,
         // IStorageListener
         virtual void changesOccurred(const OUString& sPath);
 
-        //______________________________________
+
         // helper for derived classes
 
     protected:
 
-        //---------------------------------------
+
         /** @short  return the current office locale.
 
         @descr  We do not cache this value, because we are not listen
@@ -210,12 +210,12 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase,
         */
         OUString impl_ts_getLocale() const;
 
-        //______________________________________
+
         // helper
 
     private:
 
-        //---------------------------------------
+
         /** @short  load a configuration set, using the given stream.
 
         @param  xStream
@@ -223,7 +223,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase,
         */
         void impl_ts_load(const css::uno::Reference< css::io::XInputStream >& xStream);
 
-        //---------------------------------------
+
         /** @short  save a configuration set, using the given stream.
 
         @param  xStream
@@ -231,7 +231,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase,
         */
         void impl_ts_save(const css::uno::Reference< css::io::XOutputStream >& xStream);
 
-        //---------------------------------------
+
         /** @short  try to locate and open a sub storage.
 
         @descr  It search at the root storage for the specified
@@ -259,7 +259,7 @@ class XMLBasedAcceleratorConfiguration : protected ThreadHelpBase,
             const OUString&                             sSubStorage ,
             sal_Bool                                     bOutStream  );
 
-        //---------------------------------------
+
         /** @short  returns a reference to one of our internal cache members.
 
         @descr  We implement the copy-on-write pattern. Doing so
@@ -291,12 +291,12 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase,
                                                                                            //    css::ui::XUIConfigurationStorage
                                                                                            //    css::ui::XUIConfiguration
 {
-    //______________________________________
+
     // member
 
     protected:
 
-        //---------------------------------------
+
         /** the global uno service manager.
         Must be used to create own needed services. */
         css::uno::Reference< css::uno::XComponentContext > m_xContext;
@@ -312,7 +312,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase,
 
         ::salhelper::SingletonRef< KeyMapping > m_rKeyMapping;
 
-        //______________________________________
+
         // native interface!
 
     public:
@@ -320,7 +320,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase,
         XCUBasedAcceleratorConfiguration( const css::uno::Reference< css::uno::XComponentContext >& xContext );
         virtual ~XCUBasedAcceleratorConfiguration(                                                           );
 
-        //______________________________________
+
         // uno interface!
 
     public:
@@ -413,12 +413,12 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase,
         virtual  void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual  void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
-        //______________________________________
+
         // helper for derived classes
 
     protected:
 
-        //---------------------------------------
+
         /** @short  return the current office locale.
 
         @descr  We do not cache this value, because we are not listen
@@ -429,7 +429,7 @@ class XCUBasedAcceleratorConfiguration : protected ThreadHelpBase,
         */
         OUString impl_ts_getLocale() const;
 
-        //______________________________________
+
         // helper
 
     private:
diff --git a/framework/source/inc/accelerators/istoragelistener.hxx b/framework/source/inc/accelerators/istoragelistener.hxx
index 9d84c26d1338..154a1eb0caee 100644
--- a/framework/source/inc/accelerators/istoragelistener.hxx
+++ b/framework/source/inc/accelerators/istoragelistener.hxx
@@ -24,13 +24,13 @@
 #include <stdtypes.h>
 
 
-//__________________________________________
+
 // definition
 
 namespace framework
 {
 
-//__________________________________________
+
 /**
     TODO document me
  */
@@ -38,7 +38,7 @@ class IStorageListener
 {
     public:
 
-        //--------------------------------------
+
         /** @short  TODO */
         virtual void changesOccurred(const OUString& sPath) = 0;
 
diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx
index d73816af181b..0336934f4358 100644
--- a/framework/source/inc/accelerators/keymapping.hxx
+++ b/framework/source/inc/accelerators/keymapping.hxx
@@ -30,19 +30,19 @@
 namespace framework
 {
 
-//__________________________________________
+
 /**
     can be used to map key identifier to the
     corresponding key codes ...
  */
 class KeyMapping
 {
-    //______________________________________
+
     // const, types
 
     private:
 
-        //---------------------------------------
+
         /** @short  is used to map a key code
                     to the right key identifier, which is
                     used to make the xml file "human readable"
@@ -53,33 +53,33 @@ class KeyMapping
             const char*     Identifier;
         };
 
-        //---------------------------------------
+
         /** @short  hash structure to map identifier to key codes. */
         typedef BaseHash< sal_Int16 > Identifier2CodeHash;
 
-        //---------------------------------------
+
         /** @short  hash structure to map key codes to identifier. */
         typedef ::boost::unordered_map< sal_Int16                    ,
                                  OUString              ,
                                  ShortHashCode                ,
                                  ::std::equal_to< sal_Int16 > > Code2IdentifierHash;
 
-    //______________________________________
+
     // member
 
     private:
 
         static KeyIdentifierInfo KeyIdentifierMap[];
 
-        //---------------------------------------
+
         /** @short  hash to map identifier to key codes. */
         Identifier2CodeHash m_lIdentifierHash;
 
-        //---------------------------------------
+
         /** @short  hash to map key codes to identifier. */
         Code2IdentifierHash m_lCodeHash;
 
-    //______________________________________
+
     // interface
 
     public:
@@ -87,7 +87,7 @@ class KeyMapping
                  KeyMapping();
         virtual ~KeyMapping();
 
-        //----------------------------------
+
         /** @short  return a suitable key code
                     for the specified key identifier.
 
@@ -105,7 +105,7 @@ class KeyMapping
         virtual sal_uInt16 mapIdentifierToCode(const OUString& sIdentifier)
             throw(css::lang::IllegalArgumentException);
 
-        //----------------------------------
+
         /** @short  return a suitable key identifier
                     for the specified key code.
 
@@ -116,12 +116,12 @@ class KeyMapping
          */
         virtual OUString mapCodeToIdentifier(sal_uInt16 nCode);
 
-    //______________________________________
+
     // helper
 
     private:
 
-        //----------------------------------
+
         /** @short  check if the given string describe a numeric
                     value ... and convert it.
 
diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx
index 45896436572e..1ca54f710f5e 100644
--- a/framework/source/inc/accelerators/presethandler.hxx
+++ b/framework/source/inc/accelerators/presethandler.hxx
@@ -64,12 +64,12 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
         static OUString RESOURCETYPE_ACCELERATOR();
         static OUString RESOURCETYPE_STATUSBAR();
 
-    //-------------------------------------------
+
     // types
 
     public:
 
-        //---------------------------------------
+
         /** @short  this handler can provide different
                     types of configuration.
 
@@ -85,7 +85,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
 
     private:
 
-        //---------------------------------------
+
         /** @short  because a concurrent access to the same storage from different implementations
                     isnt supported, we have to share it with others.
 
@@ -112,23 +112,23 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
                 virtual ~TSharedStorages() {};
         };
 
-    //-------------------------------------------
+
     // member
 
     private:
 
-        //---------------------------------------
+
         /** @short  can be used to create on needed uno resources. */
         css::uno::Reference< css::uno::XComponentContext > m_xContext;
 
-        //---------------------------------------
+
         /** @short  knows the type of provided configuration.
 
             @descr  e.g. global, modules, ...
          */
         EConfigType m_eConfigType;
 
-        //---------------------------------------
+
         /** @short  specify the type of resource, which configuration sets
                     must be provided here.
 
@@ -136,7 +136,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
          */
         OUString m_sResourceType;
 
-        //---------------------------------------
+
         /** @short  specify the application module for a module
                     dependend configuration.
 
@@ -146,19 +146,19 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
          */
         OUString m_sModule;
 
-        //---------------------------------------
+
         /** @short  provides access to the:
                     a) shared root storages
                     b) shared "inbetween" storages
                     of the share and user layer. */
         ::salhelper::SingletonRef< TSharedStorages > m_aSharedStorages;
 
-        //---------------------------------------
+
         /** @short  if we run in document mode, we cant use the global root storages!
                     We have to use a special document storage explicitly. */
         StorageHolder m_lDocumentStorages;
 
-        //---------------------------------------
+
         /** @short  holds the folder storage of the share layer alive,
                     where the current configuration set exists.
 
@@ -171,12 +171,12 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
          */
         css::uno::Reference< css::embed::XStorage > m_xWorkingStorageShare;
 
-        //---------------------------------------
+
         /** @short  global language-independent storage
          */
         css::uno::Reference< css::embed::XStorage > m_xWorkingStorageNoLang;
 
-        //---------------------------------------
+
         /** @short  holds the folder storage of the user layer alive,
                     where the current configuration set exists.
 
@@ -189,17 +189,17 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
          */
         css::uno::Reference< css::embed::XStorage > m_xWorkingStorageUser;
 
-        //---------------------------------------
+
         /** @short  knows the names of all presets inside the current
                     working storage of the share layer. */
         OUStringList m_lPresets;
 
-        //---------------------------------------
+
         /** @short  knows the names of all targets inside the current
                     working storage of the user layer. */
         OUStringList m_lTargets;
 
-        //---------------------------------------
+
         /** @short  its the current office locale and will be used
                     to handle localized presets.
 
@@ -207,18 +207,18 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
                     localized handling inside this class! */
         LanguageTag m_aLanguageTag;
 
-        //---------------------------------------
+
         /** @short  knows the relative path from the root. */
         OUString m_sRelPathShare;
         OUString m_sRelPathNoLang;
         OUString m_sRelPathUser;
 
-    //-------------------------------------------
+
     // native interface
 
     public:
 
-        //---------------------------------------
+
         /** @short  does nothing real.
 
             @descr  Because this class should be useable in combination
@@ -231,19 +231,19 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
          */
         PresetHandler(const css::uno::Reference< css::uno::XComponentContext >& xContext);
 
-        //---------------------------------------
+
         /** @short  copy ctor */
         PresetHandler(const PresetHandler& rCopy);
 
-        //---------------------------------------
+
         /** @short  closes all open storages ... if user forgot that .-) */
         virtual ~PresetHandler();
 
-        //---------------------------------------
+
         /** @short  free all currently cache(!) storages. */
         void forgetCachedStorages();
 
-        //---------------------------------------
+
         /** @short  return access to the internally used and cached root storage.
 
             @descr  These root storages are the base of all further opened
@@ -261,7 +261,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
         css::uno::Reference< css::embed::XStorage > getOrCreateRootStorageShare();
         css::uno::Reference< css::embed::XStorage > getOrCreateRootStorageUser();
 
-        //---------------------------------------
+
         /** @short  provides access to the current working storages.
 
             @descr  Working storages are the "lowest" storages, where the
@@ -273,7 +273,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
         css::uno::Reference< css::embed::XStorage > getWorkingStorageShare();
         css::uno::Reference< css::embed::XStorage > getWorkingStorageUser();
 
-        //---------------------------------------
+
         /** @short  check if there is a parent storage well known for
                     the specified child storage and return it.
 
@@ -286,7 +286,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
         css::uno::Reference< css::embed::XStorage > getParentStorageShare(const css::uno::Reference< css::embed::XStorage >& xChild);
         css::uno::Reference< css::embed::XStorage > getParentStorageUser (const css::uno::Reference< css::embed::XStorage >& xChild);
 
-        //---------------------------------------
+
         /** @short  free all internal structures and let this handler
                     work on a new type of configuration sets.
 
@@ -327,7 +327,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
                                const css::uno::Reference< css::embed::XStorage >& xDocumentRoot ,
                                const LanguageTag&                                 rLanguageTag  = LanguageTag(LANGUAGE_USER_PRIV_NOTRANSLATE));
 
-        //---------------------------------------
+
         /** @short  try to copy the specified preset from the share
                     layer to the user layer and establish it as the
                     specified target.
@@ -351,7 +351,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
         void copyPresetToTarget(const OUString& sPreset,
                                 const OUString& sTarget);
 
-        //---------------------------------------
+
         /** @short  open the specified preset as stream object
                     and return it.
 
@@ -369,7 +369,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
         css::uno::Reference< css::io::XStream > openPreset(const OUString& sPreset,
                                                            sal_Bool bUseNoLangGlobal = sal_False);
 
-        //---------------------------------------
+
         /** @short  open the specified target as stream object
                     and return it.
 
@@ -391,7 +391,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
         css::uno::Reference< css::io::XStream > openTarget(const OUString& sTarget         ,
                                                                  sal_Bool         bCreateIfMissing);
 
-        //---------------------------------------
+
         /** @short  do anything which is necessary to flush all changes
                     back to disk.
 
@@ -401,17 +401,17 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
          */
         void commitUserChanges();
 
-        //---------------------------------------
+
         /** TODO */
         void addStorageListener(IStorageListener* pListener);
         void removeStorageListener(IStorageListener* pListener);
 
-    //-------------------------------------------
+
     // helper
 
     private:
 
-        //---------------------------------------
+
         /** @short  open a config path ignoring errors (catching exceptions).
 
             @descr  We catch only normal exceptions here - no runtime exceptions.
@@ -431,7 +431,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
                                                                                       sal_Int32        eMode ,
                                                                                       sal_Bool         bShare);
 
-        //---------------------------------------
+
         /** @short  try to find the specified locale inside list of possible ones.
 
             @descr  The lits of possible locale values was e.g. retrieved from the system
@@ -458,7 +458,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
                                                                                                OUString&             rLanguageTag         ,
                                                                                                sal_Bool                          bAllowFallbacks );
 
-        //---------------------------------------
+
         /** @short  open a config path ignoring errors (catching exceptions).
 
             @descr  We catch only normal exceptions here - no runtime exceptions.
@@ -492,7 +492,7 @@ class PresetHandler : private ThreadHelpBase // attention! Must be the first bas
                                                                                          OUString&             rLanguageTag  ,
                                                                                          sal_Bool              bAllowFallback);
 
-        //---------------------------------------
+
         /** @short  returns the names of all sub storages of specified storage.
 
             @param  xFolder
diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx
index 13bef973296a..8879e0319900 100644
--- a/framework/source/inc/accelerators/storageholder.hxx
+++ b/framework/source/inc/accelerators/storageholder.hxx
@@ -32,13 +32,13 @@ namespace framework
 {
 
 
-//-----------------------------------------------
+
 /**
     TODO document me
  */
 class StorageHolder : private ThreadHelpBase // attention! Must be the first base class to guarentee right initialize lock ...
 {
-    //-------------------------------------------
+
     // types
     public:
 
@@ -65,7 +65,7 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
                                  OUStringHash                ,
                                  ::std::equal_to< OUString > > TPath2StorageInfo;
 
-    //-------------------------------------------
+
     // member
     private:
 
@@ -75,95 +75,95 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
         /** @short  TODO */
         TPath2StorageInfo m_lStorages;
 
-    //-------------------------------------------
+
     // interface
     public:
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         StorageHolder();
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         virtual ~StorageHolder();
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         virtual void forgetCachedStorages();
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         virtual void setRootStorage(const css::uno::Reference< css::embed::XStorage >& xRoot);
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         virtual css::uno::Reference< css::embed::XStorage > getRootStorage() const;
 
-        //---------------------------------------
+
         /** @short  TODO
                     open or get!
          */
         virtual css::uno::Reference< css::embed::XStorage > openPath(const OUString& sPath    ,
                                                                            sal_Int32        nOpenMode);
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         virtual StorageHolder::TStorageList getAllPathStorages(const OUString& sPath);
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         virtual void commitPath(const OUString& sPath);
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         virtual void closePath(const OUString& sPath);
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         virtual void notifyPath(const OUString& sPath);
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         virtual void addStorageListener(      IStorageListener* pListener,
                                         const OUString&  sPath    );
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         virtual void removeStorageListener(      IStorageListener* pListener,
                                            const OUString&  sPath    );
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         virtual OUString getPathOfStorage(const css::uno::Reference< css::embed::XStorage >& xStorage);
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const css::uno::Reference< css::embed::XStorage >& xChild);
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         virtual css::uno::Reference< css::embed::XStorage > getParentStorage(const OUString& sChildPath);
 
-        //---------------------------------------
+
         /** @short  TODO
          */
         void operator=(const StorageHolder& rCopy);
 
-        //---------------------------------------
+
         /** @short  opens a sub element of the specified base storage.
 
             @descr  First this method try to open the requested sub element
@@ -197,16 +197,16 @@ class StorageHolder : private ThreadHelpBase // attention! Must be the first bas
                                                                                        sal_Int32                                    eOpenMode     ,
                                                                                        sal_Bool                                     bAllowFallback);
 
-        //---------------------------------------
+
         // helper
         private:
 
-            //-----------------------------------
+
             /** @short  TODO
              */
             static OUString impl_st_normPath(const OUString& sPath);
 
-            //-----------------------------------
+
             /** @short  TODO
              */
             static OUStringList impl_st_parsePath(const OUString& sPath);
diff --git a/framework/source/inc/dispatch/loaddispatcher.hxx b/framework/source/inc/dispatch/loaddispatcher.hxx
index 9d13717418f0..23b16ac9d9c9 100644
--- a/framework/source/inc/dispatch/loaddispatcher.hxx
+++ b/framework/source/inc/dispatch/loaddispatcher.hxx
@@ -39,7 +39,7 @@ class LoadDispatcher : private ThreadHelpBase
                      , public  ::cppu::WeakImplHelper2< css::frame::XNotifyingDispatch,          // => XDispatch => XInterface
                                                         css::frame::XSynchronousDispatch >
 {
-    //___________________________________________
+
     // member
 
     private:
@@ -59,7 +59,7 @@ class LoadDispatcher : private ThreadHelpBase
         /** @short  TODO document me */
         LoadEnv m_aLoader;
 
-    //___________________________________________
+
     // native interface
 
     public:
@@ -88,13 +88,13 @@ class LoadDispatcher : private ThreadHelpBase
                        const OUString                                         sTargetName ,
                              sal_Int32                                               nSearchFlags);
 
-        //_______________________________________
+
 
         /** @short  used to free internal resources.
          */
         virtual ~LoadDispatcher();
 
-    //___________________________________________
+
     // uno interface
 
     public:
diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx
index 5aec5b650419..2c0ff5fcc9a5 100644
--- a/framework/source/inc/dispatch/windowcommanddispatch.hxx
+++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx
@@ -60,12 +60,12 @@ class WindowCommandDispatch : private ThreadHelpBase
         /// knows the VCL window (where the hard coded commands occurred) as weak XWindow reference
         css::uno::WeakReference< css::awt::XWindow > m_xWindow;
 
-    //___________________________________________
+
     // native interface
 
     public:
 
-        //_______________________________________
+
 
         /** @short  creates a new instance and initialize it with all necessary parameters.
 
@@ -82,18 +82,18 @@ class WindowCommandDispatch : private ThreadHelpBase
         WindowCommandDispatch(const css::uno::Reference< css::uno::XComponentContext >&     xContext ,
                               const css::uno::Reference< css::frame::XFrame >&              xFrame);
 
-        //_______________________________________
+
 
         /** @short  used to free internal resources.
          */
         virtual ~WindowCommandDispatch();
 
-    //___________________________________________
+
     // implementation
 
     private:
 
-        //_______________________________________
+
 
         /** @short  establish all listener connections we need.
 
@@ -108,13 +108,13 @@ class WindowCommandDispatch : private ThreadHelpBase
          */
         void impl_stopListening();
 
-        //_______________________________________
+
 
         /** @short  callback from VCL to notify new commands
          */
         DECL_LINK( impl_notifyCommand, void* );
 
-        //_______________________________________
+
 
         /** @short  dispatch right command URLs into our frame context.
 
diff --git a/framework/source/inc/loadenv/actionlockguard.hxx b/framework/source/inc/loadenv/actionlockguard.hxx
index 91d8325023f6..0fb34d4d14a6 100644
--- a/framework/source/inc/loadenv/actionlockguard.hxx
+++ b/framework/source/inc/loadenv/actionlockguard.hxx
@@ -37,7 +37,7 @@ namespace framework{
 */
 class ActionLockGuard : private ThreadHelpBase
 {
-    //-------------------------------------------
+
     // member
 
     private:
@@ -49,12 +49,12 @@ class ActionLockGuard : private ThreadHelpBase
                     forced by this guard instance. */
         sal_Bool m_bActionLocked;
 
-    //-------------------------------------------
+
     // interface
 
     public:
 
-        //---------------------------------------
+
         /** @short  default ctor to initialize a "non working guard".
 
             @descr  That can be useful in cases, where no resource still exists,
@@ -67,7 +67,7 @@ class ActionLockGuard : private ThreadHelpBase
         {
         }
 
-        //---------------------------------------
+
         /** @short  initialize new guard instance and lock the given resource immediately.
 
             @param  xLock
@@ -80,7 +80,7 @@ class ActionLockGuard : private ThreadHelpBase
             setResource(xLock);
         }
 
-        //---------------------------------------
+
         /** @short  release this guard instance and make shure, that no lock
                     will exist afterwards on the internal wrapped resource.
          */
@@ -89,7 +89,7 @@ class ActionLockGuard : private ThreadHelpBase
             unlock();
         }
 
-        //---------------------------------------
+
         /** @short  set a new resource for locking at this guard.
 
             @descr  This call will fail, if an internal resource already exists
@@ -117,7 +117,7 @@ class ActionLockGuard : private ThreadHelpBase
             return sal_True;
         }
 
-        //---------------------------------------
+
         /** @short  set a new resource for locking at this guard.
 
             @descr  This call will fail, if an internal resource already exists
@@ -147,7 +147,7 @@ class ActionLockGuard : private ThreadHelpBase
                 xLock->removeActionLock();
         }
 
-        //---------------------------------------
+
         /** @short  lock the internal wrapped resource, if its not already done. */
         virtual void lock()
         {
@@ -162,7 +162,7 @@ class ActionLockGuard : private ThreadHelpBase
             // <- SAFE ..........................
         }
 
-        //---------------------------------------
+
         /** @short  unlock the internal wrapped resource, if its not already done. */
         virtual void unlock()
         {
diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index f6c1bd7ac823..2642f09ab532 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -305,7 +305,7 @@ public:
      */
     void startLoading();
 
-    //_______________________________________
+
 
     /** @short  wait for an alreay running load request (started by calling
                 startLoading() before).
@@ -329,7 +329,7 @@ public:
      */
     sal_Bool waitWhileLoading(sal_uInt32 nTimeout = 0);
 
-    //_______________________________________
+
     /** TODO document me ... */
     css::uno::Reference< css::lang::XComponent > getTargetComponent() const;
 
@@ -381,7 +381,7 @@ public:
     /** TODO document me ... */
     css::uno::Reference< css::uno::XInterface > impl_searchLoader();
 
-    //_______________________________________
+
 
     /** @short  it means; show the frame, bring it to front,
                 might set the right icon etcpp. in case loading was
diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx
index fc54bd0378b7..8ec03e2c09ad 100644
--- a/framework/source/inc/loadenv/targethelper.hxx
+++ b/framework/source/inc/loadenv/targethelper.hxx
@@ -54,12 +54,12 @@ class TargetHelper
             E_HELPTASK
         };
 
-    //___________________________________________
+
     // interface
 
     public:
 
-        //___________________________________________
+
 
         /** @short  it checks the given unknown target name,
                     if it's the expected special one.
@@ -78,7 +78,7 @@ class TargetHelper
         static sal_Bool matchSpecialTarget(const OUString& sCheckTarget  ,
                                                  ESpecialTarget   eSpecialTarget);
 
-        //___________________________________________
+
 
         /** @short  it checks, if the given name can be used
                     to set it at a frame using XFrame.setName() method.
diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx
index 7035eb034c59..e8d400bab416 100644
--- a/framework/source/inc/pattern/frame.hxx
+++ b/framework/source/inc/pattern/frame.hxx
@@ -36,7 +36,7 @@ namespace framework{
         namespace frame{
 
 
-//-----------------------------------------------
+
 inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::uno::Reference< css::frame::XFrame >& xFrame)
 {
     css::uno::Reference< css::frame::XModel >      xModel;
@@ -48,7 +48,7 @@ inline css::uno::Reference< css::frame::XModel > extractFrameModel(const css::un
     return xModel;
 }
 
-//-----------------------------------------------
+
 /** @short  close (or dispose) the given resource.
 
     @descr  It try to close the given resource first.
diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx
index 9493589509f8..ff4510f18f9e 100644
--- a/framework/source/inc/pattern/window.hxx
+++ b/framework/source/inc/pattern/window.hxx
@@ -33,7 +33,7 @@
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 
-//_______________________________________________
+
 // namespaces
 
 namespace framework{
@@ -43,7 +43,7 @@ class WindowHelper
 {
     public:
 
-//-----------------------------------------------
+
 static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow)
 {
     if (!xWindow.is())
@@ -68,7 +68,7 @@ static OUString getWindowState(const css::uno::Reference< css::awt::XWindow >& x
     return OStringToOUString(sWindowState,RTL_TEXTENCODING_UTF8);
 }
 
-//-----------------------------------------------
+
 static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow     ,
                            const OUString&                          sWindowState)
 {
@@ -99,7 +99,7 @@ static void setWindowState(const css::uno::Reference< css::awt::XWindow >& xWind
     // <- SOLAR SAFE ----------------------------
 }
 
-//-----------------------------------------------
+
 static ::sal_Bool isTopWindow(const css::uno::Reference< css::awt::XWindow >& xWindow)
 {
     // even child frame containing top level windows (e.g. query designer of database) will be closed
diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx
index 697d8df38468..bcfcf090fc35 100644
--- a/framework/source/layoutmanager/layoutmanager.cxx
+++ b/framework/source/layoutmanager/layoutmanager.cxx
@@ -2821,7 +2821,7 @@ throw ( RuntimeException, std::exception )
     }
 }
 
-// ______________________________________________
+
 
 void SAL_CALL LayoutManager::disposing( const lang::EventObject& rEvent )
 throw( RuntimeException, std::exception )
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
index 2e1fd8d560c8..b4cbb1738883 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx
@@ -141,29 +141,25 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
         // child window notifications
         long childWindowEvent( VclSimpleEvent* pEvent );
 
-        //---------------------------------------------------------------------------------------------------------
+
         // XInterface
-        //---------------------------------------------------------------------------------------------------------
+
         virtual void SAL_CALL acquire() throw();
         virtual void SAL_CALL release() throw();
         virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw( ::com::sun::star::uno::RuntimeException, std::exception );
 
-        //---------------------------------------------------------------------------------------------------------
+
         // XEventListener
-        //---------------------------------------------------------------------------------------------------------
         virtual void SAL_CALL disposing( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception );
 
-        //---------------------------------------------------------------------------------------------------------
+
         // XWindowListener
-        //---------------------------------------------------------------------------------------------------------
         virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception );
         virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception );
         virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception );
         virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception );
 
-        //---------------------------------------------------------------------------------------------------------
         // XDockableWindowListener
-        //---------------------------------------------------------------------------------------------------------
         virtual void SAL_CALL startDocking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual ::com::sun::star::awt::DockingData SAL_CALL docking( const ::com::sun::star::awt::DockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL endDocking( const ::com::sun::star::awt::EndDockingEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
@@ -172,9 +168,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
         virtual void SAL_CALL closed( const ::com::sun::star::lang::EventObject& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL endPopupMode( const ::com::sun::star::awt::EndPopupModeEvent& e ) throw (::com::sun::star::uno::RuntimeException, std::exception);
 
-        //---------------------------------------------------------------------------------------------------------
         // XUIConfigurationListener
-        //---------------------------------------------------------------------------------------------------------
         virtual void SAL_CALL elementInserted( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL elementRemoved( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception);
         virtual void SAL_CALL elementReplaced( const ::com::sun::star::ui::ConfigurationEvent& Event ) throw (::com::sun::star::uno::RuntimeException, std::exception);
@@ -203,9 +197,9 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
             sal_Int32                                                                         nRowColumn;
         };
 
-        //---------------------------------------------------------------------------------------------------------
+
         // internal helper methods
-        //---------------------------------------------------------------------------------------------------------
+
         bool             implts_isParentWindowVisible() const;
         ::Rectangle      implts_calcDockingArea();
         void             implts_sortUIElements();
@@ -214,9 +208,9 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
         void             implts_setElementData( UIElement& rUIElement, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDockableWindow >& rDockWindow );
         void             implts_destroyDockingAreaWindows();
 
-        //---------------------------------------------------------------------------------------------------------
+
         // layout methods
-        //---------------------------------------------------------------------------------------------------------
+
         void             implts_setDockingAreaWindowSizes( const ::com::sun::star::awt::Rectangle& rBorderSpace );
         ::com::sun::star::awt::Point implts_findNextCascadeFloatingPos();
         void             implts_renumberRowColumnData( ::com::sun::star::ui::DockingArea eDockingArea, DockingOperation eDockingOperation, const UIElement& rUIElement );
@@ -228,9 +222,9 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
         void             implts_setLayoutInProgress( bool bInProgress = true );
         bool             implts_isLayoutInProgress() const { return m_bLayoutInProgress; }
 
-        //---------------------------------------------------------------------------------------------------------
+
         // lookup/container methods
-        //---------------------------------------------------------------------------------------------------------
+
         UIElement        implts_findToolbar( const OUString& aName );
         UIElement        implts_findToolbar( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xToolbar );
         UIElement&       impl_findToolbar( const OUString& aName );
@@ -241,9 +235,9 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
         ::Size           implts_getTopBottomDockingAreaSizes();
         void             implts_getUIElementVectorCopy( UIElementVector& rCopy );
 
-        //---------------------------------------------------------------------------------------------------------
+
         // internal docking methods
-        //---------------------------------------------------------------------------------------------------------
+
         ::Rectangle      implts_calcHotZoneRect( const ::Rectangle& rRect, sal_Int32 nHotZoneOffset );
         void             implts_calcDockingPosSize( UIElement& aUIElement, DockingOperation& eDockOperation, ::Rectangle& rTrackingRect, const Point& rMousePos );
         DockingOperation implts_determineDockingOperation( ::com::sun::star::ui::DockingArea DockingArea, const ::Rectangle& rRowColRect, const Point& rMousePos );
@@ -265,9 +259,9 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
         void             implts_findNextDockingPos( ::com::sun::star::ui::DockingArea DockingArea, const ::Size& aUIElementSize, ::com::sun::star::awt::Point& rVirtualPos, ::Point& rPixelPos );
         void             implts_setTrackingRect( ::com::sun::star::ui::DockingArea eDockingArea, const ::Point& rMousePos, ::Rectangle& rTrackingRect );
 
-        //---------------------------------------------------------------------------------------------------------
+
         // creation methods
-        //---------------------------------------------------------------------------------------------------------
+
         void             implts_createAddonsToolBars();
         void             implts_createCustomToolBars();
         void             implts_createNonContextSensitiveToolBars();
@@ -278,15 +272,15 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper3< ::com::sun::star::a
         void             implts_setToolbarCreation( bool bStart = true );
         bool             implts_isToolbarCreationActive();
 
-        //---------------------------------------------------------------------------------------------------------
+
         // persistence methods
-        //---------------------------------------------------------------------------------------------------------
+
         sal_Bool         implts_readWindowStateData( const OUString& aName, UIElement& rElementData );
         void             implts_writeWindowStateData( const UIElement& rElementData );
 
-        //---------------------------------------------------------------------------------------------------------
+
         // members
-        //---------------------------------------------------------------------------------------------------------
+
         css::uno::Reference< css::uno::XComponentContext >                   m_xContext;
         css::uno::Reference< css::frame::XFrame >                            m_xFrame;
         css::uno::Reference< css::awt::XWindow2 >                            m_xContainerWindow;
diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx
index 36f8a7d10310..6f9d0882e484 100644
--- a/framework/source/recording/dispatchrecorder.cxx
+++ b/framework/source/recording/dispatchrecorder.cxx
@@ -34,9 +34,9 @@ namespace framework{
 // used to mark a dispatch as comment (mostly it indicates an error) Changing of this wdefine will impact all using of such comments ...
 #define REM_AS_COMMENT    "rem "
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
+
 
 DEFINE_XSERVICEINFO_MULTISERVICE_2(
     DispatchRecorder,
@@ -68,7 +68,7 @@ void flatten_struct_members(
             Any( (char const *)data + pTD->pMemberOffsets[ nPos ], pTD->ppTypeRefs[ nPos ] ) );
     }
 }
-//==================================================================================================
+
 Sequence< Any > make_seq_out_of_struct(
     Any const & val )
     SAL_THROW( (RuntimeException) )
@@ -100,19 +100,19 @@ Sequence< Any > make_seq_out_of_struct(
     return Sequence< Any >( &vec[ 0 ], vec.size() );
 }
 
-//***********************************************************************
+
 DispatchRecorder::DispatchRecorder( const css::uno::Reference< css::uno::XComponentContext >& xContext )
         : ThreadHelpBase     ( &Application::GetSolarMutex() )
         , m_xConverter( css::script::Converter::create(xContext) )
 {
 }
 
-//************************************************************************
+
 DispatchRecorder::~DispatchRecorder()
 {
 }
 
-//*************************************************************************
+
 // generate header
 void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css::frame::XFrame >& ) throw( css::uno::RuntimeException, std::exception )
 {
@@ -120,7 +120,7 @@ void SAL_CALL DispatchRecorder::startRecording( const css::uno::Reference< css::
     /* } */
 }
 
-//*************************************************************************
+
 void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL,
                                                 const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
 {
@@ -130,7 +130,7 @@ void SAL_CALL DispatchRecorder::recordDispatch( const css::util::URL& aURL,
     m_aStatements.push_back( aStatement );
 }
 
-//*************************************************************************
+
 void SAL_CALL  DispatchRecorder::recordDispatchAsComment( const css::util::URL& aURL,
                                                           const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception )
 {
@@ -141,7 +141,6 @@ void SAL_CALL  DispatchRecorder::recordDispatchAsComment( const css::util::URL&
     m_aStatements.push_back( aStatement );
 }
 
-//*************************************************************************
 void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException, std::exception )
 {
     /* SAFE{ */
@@ -150,7 +149,6 @@ void SAL_CALL DispatchRecorder::endRecording() throw( css::uno::RuntimeException
     /* } */
 }
 
-//*************************************************************************
 OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeException, std::exception )
 {
     /* SAFE{ */
@@ -180,7 +178,7 @@ OUString SAL_CALL DispatchRecorder::getRecordedMacro() throw( css::uno::RuntimeE
     /* } */
 }
 
-//*************************************************************************
+
 void SAL_CALL DispatchRecorder::AppendToBuffer( css::uno::Any aValue, OUStringBuffer& aArgumentBuffer )
 {
     // if value == bool
diff --git a/framework/source/recording/dispatchrecordersupplier.cxx b/framework/source/recording/dispatchrecordersupplier.cxx
index 9db2b7d3125d..209afd78af71 100644
--- a/framework/source/recording/dispatchrecordersupplier.cxx
+++ b/framework/source/recording/dispatchrecordersupplier.cxx
@@ -28,9 +28,9 @@
 
 namespace framework{
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider
-//*****************************************************************************************************************
+
 
 DEFINE_XSERVICEINFO_MULTISERVICE(
     DispatchRecorderSupplier,
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx
index 9e083f9436ee..fe12cfd17a20 100644
--- a/framework/source/services/desktop.cxx
+++ b/framework/source/services/desktop.cxx
@@ -133,7 +133,7 @@ void Desktop::constructorInit()
     m_aTransactionManager.setWorkingMode( E_WORK );
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      standard constructor to create instance by factory
     @descr      This constructor initialize a new instance of this class by valid factory,
                 and will be set valid values on his member and baseclasses.
@@ -182,7 +182,7 @@ Desktop::Desktop( const css::uno::Reference< css::uno::XComponentContext >& xCon
 {
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      standard destructor
     @descr      This one do NOTHING! Use dispose() instaed of this.
 
@@ -215,7 +215,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL Desktop::getTypes(  ) throw(css::u
     );
 }
 
-//=============================================================================
+
 sal_Bool SAL_CALL Desktop::terminate()
     throw( css::uno::RuntimeException, std::exception )
 {
@@ -377,7 +377,7 @@ bool SAL_CALL Desktop::terminateQuickstarterToo()
     return terminate();
 }
 
-//=============================================================================
+
 void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
     throw( css::uno::RuntimeException, std::exception )
 {
@@ -420,7 +420,7 @@ void SAL_CALL Desktop::addTerminateListener( const css::uno::Reference< css::fra
     m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ), xListener );
 }
 
-//=============================================================================
+
 void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::frame::XTerminateListener >& xListener )
     throw( css::uno::RuntimeException, std::exception )
 {
@@ -466,7 +466,7 @@ void SAL_CALL Desktop::removeTerminateListener( const css::uno::Reference< css::
     m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::frame::XTerminateListener >*) NULL ), xListener );
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XDesktop
     @short      get access to create enumerations of all current components
     @descr      You will be the owner of the returned object and must delete it if you don't use it again.
@@ -493,7 +493,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getC
     return xAccess;
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XDesktop
     @short      return the current active component
     @descr      The most current component is the window, model or the controller of the current active frame.
@@ -527,7 +527,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::getCurrentCompone
     return xComponent;
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XDesktop
     @short      return the current active frame in hierarchy
     @descr      There can be more then one different active paths in our frame hierarchy. But only one of them
@@ -566,7 +566,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getCurrentFrame() th
     return css::uno::Reference< css::frame::XFrame >( xLast, css::uno::UNO_QUERY );
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XComponentLoader
     @short      try to load given URL into a task
     @descr      You can give us some information about the content, which you will load into a frame.
@@ -603,7 +603,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFrom
     return LoadEnv::loadComponentFromURL(xThis, m_xContext, sURL, sTargetFrameName, nSearchFlags, lArguments);
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XTasksSupplier
     @short      get access to create enumerations of ouer taskchildren
     @descr      Direct children of desktop are tasks everytime.
@@ -630,7 +630,7 @@ css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL Desktop::getT
     return NULL;
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XTasksSupplier
     @short      return current active task of ouer direct children
     @descr      Desktop children are tasks only ! If we have an active path from desktop
@@ -654,7 +654,7 @@ css::uno::Reference< css::frame::XTask > SAL_CALL Desktop::getActiveTask() throw
     return NULL;
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XDispatchProvider
     @short      search a dispatcher for given URL
     @descr      We use a helper implementation (class DispatchProvider) to do so.
@@ -700,7 +700,6 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Desktop::queryDispatch( co
     }
 }
 
-//*****************************************************************************************************************
 css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desktop::queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor >& lQueries ) throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -710,7 +709,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Desk
     return m_xDispatchHelper->queryDispatches( lQueries );
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XDipsatchProviderInterception
     @short      supports registration/deregistration of interception objects, which
                 are interested on special dispatches.
@@ -730,7 +729,7 @@ void SAL_CALL Desktop::registerDispatchProviderInterceptor( const css::uno::Refe
     xInterceptionHelper->registerDispatchProviderInterceptor( xInterceptor );
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor)
     throw( css::uno::RuntimeException, std::exception)
 {
@@ -740,7 +739,7 @@ void SAL_CALL Desktop::releaseDispatchProviderInterceptor ( const css::uno::Refe
     xInterceptionHelper->releaseDispatchProviderInterceptor( xInterceptor );
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XFramesSupplier
     @short      return access to append or remove children on desktop
     @descr      We don't implement these interface directly. We use a helper class to do this.
@@ -766,7 +765,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Desktop::getFrames() throw(
     return m_xFramesHelper;
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XFramesSupplier
     @short      set/get the current active child frame
     @descr      It must be a task. Direct children of desktop are tasks only! No frames are accepted.
@@ -805,7 +804,6 @@ void SAL_CALL Desktop::setActiveFrame( const css::uno::Reference< css::frame::XF
     }
 }
 
-//*****************************************************************************************************************
 css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -815,7 +813,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() thr
     return m_aChildTaskContainer.getActive();
 }
 
-/*-************************************************************************************************************//**
+/*
     @interface  XFrame
     @short      non implemented methods!
     @descr      Some method make no sense for our desktop! He has no window or parent or ...
@@ -828,29 +826,25 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Desktop::getActiveFrame() thr
 
     @onerror    -
     @threadsafe -
-*//*-*************************************************************************************************************/
+*/
 void SAL_CALL Desktop::initialize( const css::uno::Reference< css::awt::XWindow >& ) throw( css::uno::RuntimeException, std::exception )
 {
 }
 
-//*****************************************************************************************************************
 css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getContainerWindow() throw( css::uno::RuntimeException, std::exception )
 {
     return css::uno::Reference< css::awt::XWindow >();
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Desktop::setCreator( const css::uno::Reference< css::frame::XFramesSupplier >& /*xCreator*/ ) throw( css::uno::RuntimeException, std::exception )
 {
 }
 
-//*****************************************************************************************************************
 css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Desktop::getCreator() throw( css::uno::RuntimeException, std::exception )
 {
     return css::uno::Reference< css::frame::XFramesSupplier >();
 }
 
-//*****************************************************************************************************************
 OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException, std::exception )
 {
     /* SAFE { */
@@ -859,7 +853,6 @@ OUString SAL_CALL Desktop::getName() throw( css::uno::RuntimeException, std::exc
     /* } SAFE */
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::RuntimeException, std::exception )
 {
     /* SAFE { */
@@ -869,13 +862,11 @@ void SAL_CALL Desktop::setName( const OUString& sName ) throw( css::uno::Runtime
     /* } SAFE */
 }
 
-//*****************************************************************************************************************
 sal_Bool SAL_CALL Desktop::isTop() throw( css::uno::RuntimeException, std::exception )
 {
     return sal_True;
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Desktop::activate() throw( css::uno::RuntimeException, std::exception )
 {
     // Desktop is activae always ... but sometimes our frames try to activate
@@ -883,7 +874,6 @@ void SAL_CALL Desktop::activate() throw( css::uno::RuntimeException, std::except
     // So - please don't show any assertions here. Do nothing!
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Desktop::deactivate() throw( css::uno::RuntimeException, std::exception )
 {
     // Desktop is activae always ... but sometimes our frames try to deactivate
@@ -891,49 +881,43 @@ void SAL_CALL Desktop::deactivate() throw( css::uno::RuntimeException, std::exce
     // So - please don't show any assertions here. Do nothing!
 }
 
-//*****************************************************************************************************************
 sal_Bool SAL_CALL Desktop::isActive() throw( css::uno::RuntimeException, std::exception )
 {
     return sal_True;
 }
 
-//*****************************************************************************************************************
+
 sal_Bool SAL_CALL Desktop::setComponent( const css::uno::Reference< css::awt::XWindow >&       /*xComponentWindow*/ ,
                                          const css::uno::Reference< css::frame::XController >& /*xController*/      ) throw( css::uno::RuntimeException, std::exception )
 {
     return sal_False;
 }
 
-//*****************************************************************************************************************
 css::uno::Reference< css::awt::XWindow > SAL_CALL Desktop::getComponentWindow() throw( css::uno::RuntimeException, std::exception )
 {
     return css::uno::Reference< css::awt::XWindow >();
 }
 
-//*****************************************************************************************************************
 css::uno::Reference< css::frame::XController > SAL_CALL Desktop::getController() throw( css::uno::RuntimeException, std::exception )
 {
     return css::uno::Reference< css::frame::XController >();
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Desktop::contextChanged() throw( css::uno::RuntimeException, std::exception )
 {
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Desktop::addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception )
 {
 }
 
-//*****************************************************************************************************************
+
 //   css::frame::XFrame
-//*****************************************************************************************************************
 void SAL_CALL Desktop::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& ) throw( css::uno::RuntimeException, std::exception )
 {
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XFrame
     @short      try to find a frame with special parameters
     @descr      This method searches for a frame with the specified name.
@@ -1164,7 +1148,7 @@ void SAL_CALL Desktop::disposing()
     m_aTransactionManager.setWorkingMode( E_CLOSE );
 }
 
-/*-************************************************************************************************************//**
+/*
     @interface  XComponent
     @short      add/remove listener for dispose events
     @descr      Add an event listener to this object, if you wish to get information
@@ -1180,7 +1164,7 @@ void SAL_CALL Desktop::disposing()
 
     @onerror    -
     @threadsafe yes
-*//*-*************************************************************************************************************/
+*/
 void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -1193,7 +1177,6 @@ void SAL_CALL Desktop::addEventListener( const css::uno::Reference< css::lang::X
     m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >*) NULL ), xListener );
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -1206,7 +1189,7 @@ void SAL_CALL Desktop::removeEventListener( const css::uno::Reference< css::lang
     m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >*) NULL ), xListener );
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XDispatchResultListener
     @short      callback for dispatches
     @descr      To support our method "loadComponentFromURL()" we are listener on temp. created dispatcher.
@@ -1244,7 +1227,7 @@ void SAL_CALL Desktop::dispatchFinished( const css::frame::DispatchResultEvent&
     /* UNSAFE AREA ----------------------------------------------------------------------------------------- */
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XEventListener
     @short      not implemented!
     @descr      We are a status listener ... and so we must be an event listener too ... But we don't need it really!
@@ -1263,7 +1246,7 @@ void SAL_CALL Desktop::disposing( const css::lang::EventObject& ) throw( css::un
     SAL_WARN( "fwk", "Desktop::disposing(): Algorithm error! Normaly desktop is temp. listener ... not all the time. So this method shouldn't be called." );
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XInteractionHandler
     @short      callback for loadComponentFromURL for detected exceptions during load proccess
     @descr      In this case we must cancel loading and throw these detected exception again as result
@@ -1401,7 +1384,7 @@ OUString SAL_CALL Desktop::getUntitledPrefix()
     return m_xTitleNumberGenerator->getUntitledPrefix ();
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      try to convert a property value
     @descr      This method is called from helperclass "OPropertySetHelper".
                 Don't use this directly!
@@ -1467,7 +1450,7 @@ sal_Bool SAL_CALL Desktop::convertFastPropertyValue(       css::uno::Any&   aCon
     return bReturn ;
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      set value of a transient property
     @descr      This method is calling from helperclass "OPropertySetHelper".
                 Don't use this directly!
@@ -1501,7 +1484,7 @@ void SAL_CALL Desktop::setFastPropertyValue_NoBroadcast(       sal_Int32
     }
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      get value of a transient property
     @descr      This method is calling from helperclass "OPropertySetHelper".
                 Don't use this directly!
@@ -1539,7 +1522,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue  ,
     }
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      return structure and information about transient properties
     @descr      This method is calling from helperclass "OPropertySetHelper".
                 Don't use this directly!
@@ -1585,7 +1568,7 @@ void SAL_CALL Desktop::getFastPropertyValue( css::uno::Any& aValue  ,
     return(*pInfoHelper);
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      return propertysetinfo
     @descr      You can call this method to get information about transient properties
                 of this object.
@@ -1633,7 +1616,7 @@ css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL Desktop::getPropert
     return (*pInfo);
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      return current component of current frame
     @descr      The desktop himself has no component. But every frame in subtree.
                 If somewhere call getCurrentComponent() at this class, we try to find the right frame and
@@ -1685,7 +1668,7 @@ css::uno::Reference< css::lang::XComponent > Desktop::impl_getFrameComponent( co
     return xComponent;
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      create table with information about properties
     @descr      We use a helper class to support properties. These class need some information about this.
                 These method create a new static description table with name, type, r/w-flags and so on ...
@@ -1722,7 +1705,7 @@ const css::uno::Sequence< css::beans::Property > Desktop::impl_getStaticProperty
     return lPropertyDescriptor;
 }
 
-//=============================================================================
+
 void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lCalledListener,
                                              ::sal_Bool&                      bVeto          )
 {
@@ -1763,7 +1746,7 @@ void Desktop::impl_sendQueryTerminationEvent(Desktop::TTerminateListenerList& lC
     }
 }
 
-//=============================================================================
+
 void Desktop::impl_sendCancelTerminationEvent(const Desktop::TTerminateListenerList& lCalledListener)
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -1788,7 +1771,7 @@ void Desktop::impl_sendCancelTerminationEvent(const Desktop::TTerminateListenerL
     }
 }
 
-//=============================================================================
+
 void Desktop::impl_sendNotifyTerminationEvent()
 {
     TransactionGuard aTransaction( m_aTransactionManager, E_HARDEXCEPTIONS );
@@ -1819,7 +1802,7 @@ void Desktop::impl_sendNotifyTerminationEvent()
     }
 }
 
-//=============================================================================
+
 ::sal_Bool Desktop::impl_closeFrames(::sal_Bool bAllowUI)
 {
     ReadGuard aReadLock( m_aLock ); // start synchronize
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx
index 0323a0a77125..bf60a8f3047e 100644
--- a/framework/source/services/frame.cxx
+++ b/framework/source/services/frame.cxx
@@ -101,7 +101,7 @@ enum EActiveState
     E_FOCUS             // I have the focus now. I must a member of an active path!
 };
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      implements a normal frame of hierarchy
     @descr      An instance of these class can be a normal node in frame tree. A frame support influencing of his
                 subtree, find of subframes, activate- and deactivate-mechanism as well as
@@ -354,7 +354,7 @@ private:
 
 private:
 
-    /*-****************************************************************************************************//**
+    /*-****************************************************************************************************
         @short      helper methods
         @descr      Follow methods are needed at different points of our code (more then ones!).
 
@@ -383,7 +383,7 @@ private:
 //  (should be private everyway!)
 
 
-    /*-****************************************************************************************************//**
+    /*-****************************************************************************************************
         @short      debug-method to check incoming parameter of some other mehods of this class
         @descr      The following methods are used to check parameters for other methods
                     of this class. The return value is used directly for an ASSERT(...).
@@ -414,10 +414,10 @@ private:
     static sal_Bool implcp_windowDeactivated                   (   const   css::lang::EventObject&                                             aEvent              );
     static sal_Bool implcp_disposing                           (   const   css::lang::EventObject&                                             aEvent              );
 
-//*************************************************************************************************************
+
 //  variables
 //  -threadsafe by own read/write lock "m_aLock"
-//*************************************************************************************************************
+
 private:
 
     css::uno::Reference< css::uno::XComponentContext >                      m_xContext                          ;   /// reference to factory, which has create this instance
@@ -484,9 +484,9 @@ protected:
 
 css::uno::WeakReference< css::frame::XFrame2 > Frame::m_xCloserFrame = css::uno::WeakReference< css::frame::XFrame2 >();
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
+
 DEFINE_XINTERFACE_22                (   Frame                                                                   ,
                                         OWeakObject                                                             ,
                                         DIRECT_INTERFACE(css::lang::XTypeProvider                               ),
@@ -537,7 +537,7 @@ DEFINE_XTYPEPROVIDER_21             (   Frame
                                         css::frame::XTitleChangeBroadcaster
                                     )
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      standard constructor to create instance by factory
     @descr      This constructor initialize a new instance of this class by valid factory,
                 and will be set valid values on his member and baseclasses.
@@ -642,7 +642,7 @@ void Frame::initListeners()
     impl_initializePropInfo();
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      standard destructor
     @descr      This one do NOTHING! Use dispose() instaed of this.
 
@@ -658,7 +658,7 @@ Frame::~Frame()
     SAL_WARN_IF( m_aTransactionManager.getWorkingMode()!=E_CLOSE, "fwk", "Frame::~Frame(): Who forgot to dispose this service?" );
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  XComponentLoader
     @short      try to load given URL into a task
     @descr      You can give us some information about the content, which you will load into a frame.
@@ -701,7 +701,7 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Frame::loadComponentFromUR
     return LoadEnv::loadComponentFromURL(xThis, xContext, sURL, sTargetFrameName, nSearchFlags, lArguments);
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      return access to append or remove children on desktop
     @descr      We don't implement these interface directly. We use a helper class to do this.
                 If you wish to add or delete children to/from the container, call these method to get
@@ -736,7 +736,7 @@ css::uno::Reference< css::frame::XFrames > SAL_CALL Frame::getFrames() throw( cs
     return m_xFramesHelper;
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      get the current active child frame
     @descr      It must be a frameto. Direct children of a frame are frames only! No task or desktop is accepted.
                 We don't save this information directly in this class. We use ouer container-helper
@@ -765,7 +765,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::getActiveFrame() throw
     return m_aChildFrameContainer.getActive();
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      set the new active direct child frame
     @descr      It must be a frame to. Direct children of frame are frames only! No task or desktop is accepted.
                 We don't save this information directly in this class. We use ouer container-helper
@@ -850,7 +850,7 @@ void SAL_CALL Frame::setActiveFrame( const css::uno::Reference< css::frame::XFra
     }
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
    initialize new created layout manager
 **/
 void lcl_enableLayoutManager(const css::uno::Reference< css::frame::XLayoutManager2 >& xLayoutManager,
@@ -866,7 +866,7 @@ void lcl_enableLayoutManager(const css::uno::Reference< css::frame::XLayoutManag
     xLayoutManager->setDockingAreaAcceptor(xDockingAreaAcceptor);
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
    deinitialize layout manager
 **/
 void lcl_disableLayoutManager(const css::uno::Reference< css::frame::XLayoutManager2 >& xLayoutManager,
@@ -877,7 +877,7 @@ void lcl_disableLayoutManager(const css::uno::Reference< css::frame::XLayoutMana
     xLayoutManager->attachFrame(css::uno::Reference< css::frame::XFrame >());
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      initialize frame instance
     @descr      A frame needs a window. This method set a new one ... but should called one times only!
                 We use this window to listen for window events and forward it to our set component.
@@ -961,7 +961,7 @@ void SAL_CALL Frame::initialize( const css::uno::Reference< css::awt::XWindow >&
     pTitleHelper->setOwner(xThis);
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      returns current set container window
     @descr      The ContainerWindow property is used as a container for the component
                 in this frame. So this object implements a container interface too.
@@ -987,7 +987,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getContainerWindow() th
     return m_xContainerWindow;
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      set parent frame
     @descr      We need a parent to support some functionality! e.g. findFrame()
                 By the way we use the chance to set an internal information about our top state.
@@ -1018,7 +1018,7 @@ void SAL_CALL Frame::setCreator( const css::uno::Reference< css::frame::XFramesS
     m_bIsFrameTop = ( xIsDesktop.is() || ! xCreator.is() );
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      returns current parent frame
     @descr      The Creator is the parent frame container. If it is NULL, the frame is the uppermost one.
 
@@ -1041,7 +1041,7 @@ css::uno::Reference< css::frame::XFramesSupplier > SAL_CALL Frame::getCreator()
     return m_xParent;
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      returns current set name of frame
     @descr      This name is used to find target of findFrame() or queryDispatch() calls.
 
@@ -1060,7 +1060,7 @@ OUString SAL_CALL Frame::getName() throw( css::uno::RuntimeException, std::excep
     /* } SAFE */
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      set new name for frame
     @descr      This name is used to find target of findFrame() or queryDispatch() calls.
 
@@ -1086,7 +1086,7 @@ void SAL_CALL Frame::setName( const OUString& sName ) throw( css::uno::RuntimeEx
     /* } SAFE */
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      search for frames
     @descr      This method searches for a frame with the specified name.
                 Frames may contain other frames (e.g. a frameset) and may
@@ -1368,7 +1368,7 @@ css::uno::Reference< css::frame::XFrame > SAL_CALL Frame::findFrame( const OUStr
     return xTarget;
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      -
     @descr      Returns sal_True, if this frame is a "top frame", otherwise sal_False.
                 The "m_bIsFrameTop" member must be set in the ctor or setCreator() method.
@@ -1399,7 +1399,7 @@ sal_Bool SAL_CALL Frame::isTop() throw( css::uno::RuntimeException, std::excepti
     return m_bIsFrameTop;
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      activate frame in hierarchy
     @descr      This feature is used to mark active paths in our frame hierarchy.
                 You can be a listener for this event to react for it ... change some internal states or something else.
@@ -1492,7 +1492,7 @@ void SAL_CALL Frame::activate() throw( css::uno::RuntimeException, std::exceptio
     }
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      deactivate frame in hierarchy
     @descr      This feature is used to deactive paths in our frame hierarchy.
                 You can be a listener for this event to react for it ... change some internal states or something else.
@@ -1575,7 +1575,7 @@ void SAL_CALL Frame::deactivate() throw( css::uno::RuntimeException, std::except
     }
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      returns active state
     @descr      Call it to get information about current active state of this frame.
 
@@ -1603,7 +1603,7 @@ sal_Bool SAL_CALL Frame::isActive() throw( css::uno::RuntimeException, std::exce
             );
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      ???
     @descr      -
 
@@ -1624,7 +1624,7 @@ void SAL_CALL Frame::contextChanged() throw( css::uno::RuntimeException, std::ex
     implts_sendFrameActionEvent( css::frame::FrameAction_CONTEXT_CHANGED );
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      set new component inside the frame
     @descr      A frame is a container for a component. Use this method to set, change or realease it!
                 We accept null references! The xComponentWindow will be a child of our container window
@@ -1801,7 +1801,7 @@ sal_Bool SAL_CALL Frame::setComponent(  const   css::uno::Reference< css::awt::X
     return sal_True;
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      returns current set component window
     @descr      Frames are used to display components. The actual displayed component is
                 held by the m_xComponentWindow property. If the component implements only a
@@ -1831,7 +1831,7 @@ css::uno::Reference< css::awt::XWindow > SAL_CALL Frame::getComponentWindow() th
     return m_xComponentWindow;
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      returns current set controller
     @descr      Frames are used to display components. The actual displayed component is
                 held by the m_xComponentWindow property. If the component implements only a
@@ -1859,7 +1859,7 @@ css::uno::Reference< css::frame::XController > SAL_CALL Frame::getController() t
     return m_xController;
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      add/remove listener for activate/deactivate/contextChanged events
     @descr      -
 
@@ -1886,7 +1886,6 @@ void SAL_CALL Frame::addFrameActionListener( const css::uno::Reference< css::fra
     m_aListenerContainer.addInterface( ::getCppuType( (const css::uno::Reference< css::frame::XFrameActionListener >*)NULL ), xListener );
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -1901,7 +1900,7 @@ void SAL_CALL Frame::removeFrameActionListener( const css::uno::Reference< css::
     m_aListenerContainer.removeInterface( ::getCppuType( (const css::uno::Reference< css::frame::XFrameActionListener >*)NULL ), xListener );
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      support two way mechanism to release a frame
     @descr      This method ask internal component (controller) if he accept this close request.
                 In case of <TRUE/> nothing will be happen (from point of caller of this close method).
@@ -2002,7 +2001,7 @@ void SAL_CALL Frame::close( sal_Bool bDeliverOwnership ) throw( css::util::Close
     dispose();
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      be a listener for close events!
     @descr      Adds/remove a CloseListener at this frame instance. If the close() method is called on
                 this object, the such listener are informed and can disagree with that by throwing
@@ -2025,7 +2024,6 @@ void SAL_CALL Frame::addCloseListener( const css::uno::Reference< css::util::XCl
     m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >* ) NULL ), xListener );
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::XCloseListener >& xListener ) throw (css::uno::RuntimeException, std::exception)
 {
     // Use soft exception mode - moslty this method is called during disposing of this frame ...
@@ -2035,7 +2033,7 @@ void SAL_CALL Frame::removeCloseListener( const css::uno::Reference< css::util::
     m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::util::XCloseListener >* ) NULL ), xListener );
 }
 
-//*****************************************************************************************************************
+
 OUString SAL_CALL Frame::getTitle()
     throw (css::uno::RuntimeException, std::exception)
 {
@@ -2050,7 +2048,7 @@ OUString SAL_CALL Frame::getTitle()
     return xTitle->getTitle();
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL Frame::setTitle( const OUString& sTitle )
     throw (css::uno::RuntimeException, std::exception)
 {
@@ -2065,7 +2063,7 @@ void SAL_CALL Frame::setTitle( const OUString& sTitle )
     xTitle->setTitle(sTitle);
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener)
     throw (css::uno::RuntimeException, std::exception)
 {
@@ -2080,7 +2078,7 @@ void SAL_CALL Frame::addTitleChangeListener( const css::uno::Reference< css::fra
     xTitle->addTitleChangeListener(xListener);
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL Frame::removeTitleChangeListener( const css::uno::Reference< css::frame::XTitleChangeListener >& xListener )
     throw (css::uno::RuntimeException, std::exception)
 {
@@ -2172,7 +2170,7 @@ void Frame::implts_forgetSubFrames()
     // <- SAFE
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      destroy instance
     @descr      The owner of this object calles the dispose method if the object
                 should be destroyed. All other objects and components, that are registered
@@ -2319,7 +2317,7 @@ void SAL_CALL Frame::dispose() throw( css::uno::RuntimeException, std::exception
     Application::SetDialogCancelMode( old );
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      Be a listener for dispose events!
     @descr      Adds/remove an EventListener to this object. If the dispose method is called on
                 this object, the disposing method of the listener is called.
@@ -2344,7 +2342,6 @@ void SAL_CALL Frame::addEventListener( const css::uno::Reference< css::lang::XEv
     m_aListenerContainer.addInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener );
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -2359,7 +2356,7 @@ void SAL_CALL Frame::removeEventListener( const css::uno::Reference< css::lang::
     m_aListenerContainer.removeInterface( ::getCppuType( ( const css::uno::Reference< css::lang::XEventListener >* ) NULL ), xListener );
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      create new status indicator
     @descr      Use returned status indicator to show progresses and some text information.
                 All created objects share the same dialog! Only the last one can show his information.
@@ -2399,7 +2396,7 @@ css::uno::Reference< css::task::XStatusIndicator > SAL_CALL Frame::createStatusI
     return css::uno::Reference< css::task::XStatusIndicator >();
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      search for target to load URL
     @descr      This method searches for a dispatch for the specified DispatchDescriptor.
                 The FrameSearchFlags and the FrameName of the DispatchDescriptor are
@@ -2444,7 +2441,7 @@ css::uno::Reference< css::frame::XDispatch > SAL_CALL Frame::queryDispatch( cons
     }
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      handle more then ones dispatches at same call
     @descr      Returns a sequence of dispatches. For details see the queryDispatch method.
                 For failed dispatches we return empty items in list!
@@ -2467,7 +2464,7 @@ css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL Fram
     return m_xDispatchHelper->queryDispatches( lDescriptor );
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      register/unregister interceptor for dispatch calls
     @descr      If you wish to handle some dispatches by himself ... you should be
                 an interceptor for it. Please see class OInterceptionHelper for further information.
@@ -2491,7 +2488,6 @@ void SAL_CALL Frame::registerDispatchProviderInterceptor( const css::uno::Refere
     xInterceptionHelper->registerDispatchProviderInterceptor( xInterceptor );
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Frame::releaseDispatchProviderInterceptor( const css::uno::Reference< css::frame::XDispatchProviderInterceptor >& xInterceptor ) throw( css::uno::RuntimeException, std::exception )
 {
     // We use a helper to support these interface and an interceptor mechanism.
@@ -2505,7 +2501,7 @@ void SAL_CALL Frame::releaseDispatchProviderInterceptor( const css::uno::Referen
     xInterceptionHelper->releaseDispatchProviderInterceptor( xInterceptor );
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      provides information about all possible dispatch functions
                 inside the currnt frame environment
 *//*-*****************************************************************************************************/
@@ -2515,14 +2511,14 @@ css::uno::Sequence< sal_Int16 > SAL_CALL Frame::getSupportedCommandGroups()
     return m_xDispatchInfoHelper->getSupportedCommandGroups();
 }
 
-//*****************************************************************************************************************
+
 css::uno::Sequence< css::frame::DispatchInformation > SAL_CALL Frame::getConfigurableDispatchInformation(sal_Int16 nCommandGroup)
     throw(css::uno::RuntimeException, std::exception)
 {
     return m_xDispatchInfoHelper->getConfigurableDispatchInformation(nCommandGroup);
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      notifications for window events
     @descr      We are a listener on our container window to forward it to our component window.
 
@@ -2551,7 +2547,6 @@ void SAL_CALL Frame::windowResized( const css::awt::WindowEvent& aEvent ) throw(
     implts_resizeComponentWindow();
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& aEvent ) throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -2575,7 +2570,7 @@ void SAL_CALL Frame::focusGained( const css::awt::FocusEvent& aEvent ) throw( cs
     }
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      notifications for window events
     @descr      We are a listener on our container window to forward it to our component window ...
                 but a XTopWindowListener we are only if we are a top frame!
@@ -2612,7 +2607,6 @@ void SAL_CALL Frame::windowActivated( const css::lang::EventObject& aEvent ) thr
     }
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception )
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -2663,7 +2657,6 @@ void SAL_CALL Frame::windowDeactivated( const css::lang::EventObject& aEvent ) t
     }
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception )
 {
     /* #i62088#
@@ -2709,7 +2702,7 @@ void SAL_CALL Frame::windowClosing( const css::lang::EventObject& ) throw( css::
     // Or if it will be reached it will be for sure that all your member are gone .-)
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      react for a show event for the internal container window
     @descr      Normaly we don't need this information really. But we can use it to
                 implement the special feature "trigger first visible task".
@@ -2774,7 +2767,7 @@ void SAL_CALL Frame::windowHidden( const css::lang::EventObject& ) throw(css::un
     impl_checkMenuCloser();
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      called by dispose of our windows!
     @descr      This object is forced to release all references to the interfaces given
                 by the parameter source. We are a listener at our container window and
@@ -2811,7 +2804,7 @@ void SAL_CALL Frame::disposing( const css::lang::EventObject& aEvent ) throw( cs
     }
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @interface  com.sun.star.document.XActionLockable
     @short      implement locking of frame/task from outside
     @descr      Sometimes we have problems to decide if closing of task is allowed. Because; frame/task
@@ -2837,7 +2830,6 @@ sal_Bool SAL_CALL Frame::isActionLocked() throw( css::uno::RuntimeException, std
     return( m_nExternalLockCount!=0);
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Frame::addActionLock() throw( css::uno::RuntimeException, std::exception )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -2845,7 +2837,6 @@ void SAL_CALL Frame::addActionLock() throw( css::uno::RuntimeException, std::exc
     ++m_nExternalLockCount;
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Frame::removeActionLock() throw( css::uno::RuntimeException, std::exception )
 {
     // Register no transaction here! Otherwhise we wait for ever inside possible
@@ -2860,7 +2851,6 @@ void SAL_CALL Frame::removeActionLock() throw( css::uno::RuntimeException, std::
     implts_checkSuicide();
 }
 
-//*****************************************************************************************************************
 void SAL_CALL Frame::setActionLocks( sal_Int16 nLock ) throw( css::uno::RuntimeException, std::exception )
 {
     /* SAFE AREA ----------------------------------------------------------------------------------------------- */
@@ -2872,7 +2862,6 @@ void SAL_CALL Frame::setActionLocks( sal_Int16 nLock ) throw( css::uno::RuntimeE
     m_nExternalLockCount = m_nExternalLockCount + nLock;
 }
 
-//*****************************************************************************************************************
 sal_Int16 SAL_CALL Frame::resetActionLocks() throw( css::uno::RuntimeException, std::exception )
 {
     // Register no transaction here! Otherwhise we wait for ever inside possible
@@ -2894,7 +2883,7 @@ sal_Int16 SAL_CALL Frame::resetActionLocks() throw( css::uno::RuntimeException,
     return nCurrentLocks;
 }
 
-//*****************************************************************************************************************
+
 void Frame::impl_initializePropInfo()
 {
     impl_setPropertyChangeBroadcaster(static_cast< css::frame::XFrame* >(this));
@@ -2935,7 +2924,7 @@ void Frame::impl_initializePropInfo()
             css::beans::PropertyAttribute::TRANSIENT));
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/,
                                                  sal_Int32        nHandle  ,
                                            const css::uno::Any&   aValue   )
@@ -2995,7 +2984,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/,
     }
 }
 
-//*****************************************************************************************************************
+
 css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty*/,
                                                           sal_Int32        nHandle  )
 {
@@ -3042,7 +3031,7 @@ css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty*
     return aValue;
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      dispose old container window and forget his reference
     @descr      Sometimes we must repair our "modal dialog parent mechanism" too!
 
@@ -3066,7 +3055,7 @@ void Frame::impl_disposeContainerWindow( css::uno::Reference< css::awt::XWindow
     }
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      send frame action event to our listener
     @descr      This method is threadsafe AND can be called by our dispose method too!
 
@@ -3127,7 +3116,7 @@ void Frame::implts_sendFrameActionEvent( const css::frame::FrameAction& aAction
     }
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      helper to resize our component window
     @descr      A frame contains 2 windows - a container ~ and a component window.
                 This method resize inner component window to full size of outer container window.
@@ -3163,7 +3152,7 @@ void Frame::implts_resizeComponentWindow()
     }
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      helper to set icon on our container window (if it is a system window!)
     @descr      We use our internal set controller (if it exist) to specify which factory he represanted.
                 These information can be used to find right icon. But our controller can say it us directly
@@ -3258,7 +3247,7 @@ void Frame::implts_setIconOnWindow()
     }
 }
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short      helper to start/stop listeneing for window events on container window
     @descr      If we get a new container window, we must set it on internal member ...
                 and stop listening at old one ... and start listening on new one!
@@ -3312,7 +3301,7 @@ void Frame::implts_startWindowListening()
     }
 }
 
-//*****************************************************************************************************************
+
 void Frame::implts_stopWindowListening()
 {
     /* UNSAFE AREA --------------------------------------------------------------------------------------------- */
@@ -3352,7 +3341,7 @@ void Frame::implts_stopWindowListening()
     }
 }
 
-/*-****************************************************************************************************//**
+/*-****************************************************************************************************
     @short      helper to force breaked close() request again
     @descr      If we self disagree with a close() request, and detect that all external locks are gone ...
                 then we must try to close this frame again.
@@ -3517,7 +3506,7 @@ void Frame::impl_checkMenuCloser()
 //  debug methods
 
 
-//*****************************************************************************************************************
+
 // Its allowed to reset the active frame membervariable with a NULL-css::uno::Reference but not with a NULL-pointer!
 // And we accept frames only! No tasks and desktops!
 sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XFrame >& xFrame )
@@ -3525,49 +3514,49 @@ sal_Bool Frame::implcp_setActiveFrame( const css::uno::Reference< css::frame::XF
     return css::uno::Reference< css::frame::XDesktop >( xFrame, css::uno::UNO_QUERY ).is();
 }
 
-//*****************************************************************************************************************
+
 sal_Bool Frame::implcp_addFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener )
 {
     return !xListener.is();
 }
 
-//*****************************************************************************************************************
+
 sal_Bool Frame::implcp_removeFrameActionListener( const css::uno::Reference< css::frame::XFrameActionListener >& xListener )
 {
     return !xListener.is();
 }
 
-//*****************************************************************************************************************
+
 sal_Bool Frame::implcp_addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
 {
     return !xListener.is();
 }
 
-//*****************************************************************************************************************
+
 sal_Bool Frame::implcp_removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener )
 {
     return !xListener.is();
 }
 
-//*****************************************************************************************************************
+
 sal_Bool Frame::implcp_windowResized( const css::awt::WindowEvent& aEvent )
 {
     return !aEvent.Source.is();
 }
 
-//*****************************************************************************************************************
+
 sal_Bool Frame::implcp_focusGained( const css::awt::FocusEvent& aEvent )
 {
     return !aEvent.Source.is();
 }
 
-//*****************************************************************************************************************
+
 sal_Bool Frame::implcp_windowActivated( const css::lang::EventObject& aEvent )
 {
     return !aEvent.Source.is();
 }
 
-//*****************************************************************************************************************
+
 sal_Bool Frame::implcp_windowDeactivated( const css::lang::EventObject& aEvent )
 {
     return !aEvent.Source.is();
diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx
index 70e057f48a1d..bcde6a97300f 100644
--- a/framework/source/services/license.cxx
+++ b/framework/source/services/license.cxx
@@ -79,9 +79,9 @@ static const char *szWNTLicenseName = "/license";
 static const char *szWNTLicenseExt = ".txt";
 #endif
 
-//*****************************************************************************************************************
+
 //  constructor
-//*****************************************************************************************************************
+
 License::License( const Reference< XComponentContext >& rxContext )
         //  Init baseclasses first
         //  Attention:
@@ -96,16 +96,16 @@ License::License( const Reference< XComponentContext >& rxContext )
 {
 }
 
-//*****************************************************************************************************************
+
 //  destructor
-//*****************************************************************************************************************
+
 License::~License()
 {
 }
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
+
 
 DEFINE_XSERVICEINFO_MULTISERVICE_2  (   License,
                                         OWeakObject                 ,
@@ -318,9 +318,9 @@ void SAL_CALL License::removeCloseListener(const css::uno::Reference< css::util:
 }
 
 
-//************************************************************************
+
 //   License Dialog
-//************************************************************************
+
 
 LicenseDialog::LicenseDialog(const OUString & aLicensePath, ResMgr *pResMgr) :
     ModalDialog(NULL, ResId(DLG_LICENSE, *pResMgr)),
diff --git a/framework/source/services/mediatypedetectionhelper.cxx b/framework/source/services/mediatypedetectionhelper.cxx
index cbbeb85e6032..77c5e723bcef 100644
--- a/framework/source/services/mediatypedetectionhelper.cxx
+++ b/framework/source/services/mediatypedetectionhelper.cxx
@@ -27,17 +27,17 @@ namespace framework
 using namespace ::com::sun::star        ;
 using namespace ::rtl                   ;
 
-//*****************************************************************************************************************
+
 //  constructor
-//*****************************************************************************************************************
+
 MediaTypeDetectionHelper::MediaTypeDetectionHelper( const uno::Reference< lang::XMultiServiceFactory >& xFactory )
     : m_xFactory( xFactory )
 {
 }
 
-//*****************************************************************************************************************
+
 //  destructor
-//*****************************************************************************************************************
+
 MediaTypeDetectionHelper::~MediaTypeDetectionHelper()
 {
 }
@@ -53,9 +53,9 @@ DEFINE_INIT_SERVICE                 (   MediaTypeDetectionHelper,
                                         }
                                     )
 
-//*****************************************************************************************************************
+
 //   XStringMapping
-//*****************************************************************************************************************
+
 
 sal_Bool SAL_CALL MediaTypeDetectionHelper::mapStrings(uno::Sequence< OUString >& rSeq)
     throw (uno::RuntimeException, std::exception)
diff --git a/framework/source/services/tabwindowservice.cxx b/framework/source/services/tabwindowservice.cxx
index ae8c3f4d291e..6ef05ffea908 100644
--- a/framework/source/services/tabwindowservice.cxx
+++ b/framework/source/services/tabwindowservice.cxx
@@ -79,7 +79,7 @@ typedef ::boost::unordered_map< ::sal_Int32                    ,
                          Int32HashCode                  ,
                          ::std::equal_to< ::sal_Int32 > > TTabPageInfoHash;
 
-/*-************************************************************************************************************//**
+/*-************************************************************************************************************
     @short  implements a helper service providing a dockable tab control window
 *//*-*************************************************************************************************************/
 
@@ -202,9 +202,9 @@ DEFINE_XTYPEPROVIDER_6              (   TabWindowService               ,
                                     )
 
 
-//*****************************************************************************************************************
+
 //  constructor
-//*****************************************************************************************************************
+
 TabWindowService::TabWindowService()
         //  Init baseclasses first
         //  Attention:
@@ -235,9 +235,9 @@ void TabWindowService::initProperties()
     m_aTransactionManager.setWorkingMode( E_WORK );
 }
 
-//*****************************************************************************************************************
+
 //  destructor
-//*****************************************************************************************************************
+
 TabWindowService::~TabWindowService()
 {
     // SAFE->
@@ -247,9 +247,9 @@ TabWindowService::~TabWindowService()
         m_pTabWin->RemoveEventListener( LINK( this, TabWindowService, EventListener ) );
 }
 
-//*****************************************************************************************************************
+
 //  XSimpleTabController
-//*****************************************************************************************************************
+
 ::sal_Int32 SAL_CALL TabWindowService::insertTab()
     throw ( css::uno::RuntimeException, std::exception )
 {
@@ -264,9 +264,9 @@ TabWindowService::~TabWindowService()
     return nID;
 }
 
-//*****************************************************************************************************************
+
 //  XSimpleTabController
-//*****************************************************************************************************************
+
 void SAL_CALL TabWindowService::removeTab(::sal_Int32 nID)
     throw (css::lang::IndexOutOfBoundsException,
            css::uno::RuntimeException, std::exception          )
@@ -283,9 +283,9 @@ void SAL_CALL TabWindowService::removeTab(::sal_Int32 nID)
         pTabWin->RemovePage(nID);
 }
 
-//*****************************************************************************************************************
+
 //  XSimpleTabController
-//*****************************************************************************************************************
+
 void SAL_CALL TabWindowService::setTabProps(      ::sal_Int32                                   nID        ,
                                               const css::uno::Sequence< css::beans::NamedValue >& lProperties)
     throw (css::lang::IndexOutOfBoundsException,
@@ -310,9 +310,9 @@ void SAL_CALL TabWindowService::setTabProps(      ::sal_Int32
     }
 }
 
-//*****************************************************************************************************************
+
 //  XSimpleTabController
-//*****************************************************************************************************************
+
 css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindowService::getTabProps(::sal_Int32 nID)
     throw (css::lang::IndexOutOfBoundsException,
            css::uno::RuntimeException, std::exception          )
@@ -327,9 +327,9 @@ css::uno::Sequence< css::beans::NamedValue > SAL_CALL TabWindowService::getTabPr
     return rInfo.m_lProperties;
 }
 
-//*****************************************************************************************************************
+
 //  XSimpleTabController
-//*****************************************************************************************************************
+
 void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID)
     throw (css::lang::IndexOutOfBoundsException,
            css::uno::RuntimeException, std::exception          )
@@ -346,9 +346,9 @@ void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID)
         pTabWin->ActivatePage(nID);
 }
 
-//*****************************************************************************************************************
+
 //  XSimpleTabController
-//*****************************************************************************************************************
+
 ::sal_Int32 SAL_CALL TabWindowService::getActiveTabID()
     throw (css::uno::RuntimeException, std::exception)
 {
@@ -357,27 +357,27 @@ void SAL_CALL TabWindowService::activateTab(::sal_Int32 nID)
     return m_nCurrentPageIndex;
 }
 
-//*****************************************************************************************************************
+
 //  XSimpleTabController
-//*****************************************************************************************************************
+
 void SAL_CALL TabWindowService::addTabListener(const css::uno::Reference< css::awt::XTabListener >& xListener)
     throw (css::uno::RuntimeException, std::exception)
 {
     m_lListener.addInterface(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*)NULL), xListener);
 }
 
-//*****************************************************************************************************************
+
 //  XSimpleTabController
-//*****************************************************************************************************************
+
 void SAL_CALL TabWindowService::removeTabListener(const css::uno::Reference< css::awt::XTabListener >& xListener)
     throw (css::uno::RuntimeException, std::exception)
 {
     m_lListener.removeInterface(::getCppuType((const css::uno::Reference< css::awt::XTabListener >*)NULL), xListener);
 }
 
-//*****************************************************************************************************************
+
 //  XComponent
-//*****************************************************************************************************************
+
 void SAL_CALL TabWindowService::dispose()
     throw (css::uno::RuntimeException, std::exception)
 {
@@ -396,25 +396,25 @@ void SAL_CALL TabWindowService::dispose()
     m_xTabWin.clear();
 }
 
-//*****************************************************************************************************************
+
 //  XComponent
-//*****************************************************************************************************************
+
 void SAL_CALL TabWindowService::addEventListener(const css::uno::Reference< css::lang::XEventListener >& xListener)
     throw (css::uno::RuntimeException, std::exception)
 {
     m_lListener.addInterface(::getCppuType((const css::uno::Reference< css::lang::XEventListener >*)NULL), xListener);
 }
 
-//*****************************************************************************************************************
+
 //  XComponent
-//*****************************************************************************************************************
+
 void SAL_CALL TabWindowService::removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener)
     throw (css::uno::RuntimeException, std::exception)
 {
     m_lListener.removeInterface(::getCppuType((const css::uno::Reference< css::lang::XEventListener >*)NULL), xListener);
 }
 
-//*****************************************************************************************************************
+
 void TabWindowService::impl_initializePropInfo()
 {
     impl_setPropertyChangeBroadcaster(static_cast< css::awt::XSimpleTabController* >(this));
@@ -427,7 +427,7 @@ void TabWindowService::impl_initializePropInfo()
             css::beans::PropertyAttribute::TRANSIENT));
 }
 
-//*****************************************************************************************************************
+
 void SAL_CALL TabWindowService::impl_setPropertyValue(const OUString& /*sProperty*/,
                                                               sal_Int32        /*nHandle  */,
                                                         const css::uno::Any&   /*aValue   */)
@@ -435,7 +435,7 @@ void SAL_CALL TabWindowService::impl_setPropertyValue(const OUString& /*sPropert
 {
 }
 
-//*****************************************************************************************************************
+
 css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const OUString& /*sProperty*/,
                                                                        sal_Int32        nHandle      )
 {
@@ -458,9 +458,9 @@ css::uno::Any SAL_CALL TabWindowService::impl_getPropertyValue(const OUString& /
     return aValue;
 }
 
-//*****************************************************************************************************************
+
 //  TabWindowService
-//*****************************************************************************************************************
+
 IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent )
 {
 
@@ -527,9 +527,9 @@ IMPL_LINK( TabWindowService, EventListener, VclSimpleEvent*, pEvent )
     return 0;
 }
 
-//*****************************************************************************************************************
+
 //  TabWindowService
-//*****************************************************************************************************************
+
 void TabWindowService::impl_checkTabIndex (::sal_Int32 nID)
     throw (css::lang::IndexOutOfBoundsException)
 {
@@ -544,9 +544,9 @@ void TabWindowService::impl_checkTabIndex (::sal_Int32 nID)
     }
 }
 
-//*****************************************************************************************************************
+
 //  TabWindowService
-//*****************************************************************************************************************
+
 TTabPageInfoHash::iterator TabWindowService::impl_getTabPageInfo(::sal_Int32 nID)
     throw (css::lang::IndexOutOfBoundsException)
 {
diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx
index 6af2e8e51b14..3f60751bd7a2 100644
--- a/framework/source/services/uriabbreviation.cxx
+++ b/framework/source/services/uriabbreviation.cxx
@@ -30,9 +30,9 @@
 namespace framework
 {
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
+
 DEFINE_XSERVICEINFO_MULTISERVICE_2 (    UriAbbreviation                                                         ,
                                         ::cppu::OWeakObject                                                     ,
                                         SERVICENAME_STRINGABBREVIATION                                          ,
diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx
index e392e980bd07..25cd3f948159 100644
--- a/framework/source/services/urltransformer.cxx
+++ b/framework/source/services/urltransformer.cxx
@@ -123,9 +123,8 @@ namespace
         _rURL.Main       = _rParser.GetMainURL( INetURLObject::NO_DECODE           );
     }
 }
-//*****************************************************************************************************************
+
 //  XURLTransformer
-//*****************************************************************************************************************
 sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception )
 {
     // Safe impossible cases.
@@ -176,9 +175,9 @@ sal_Bool SAL_CALL URLTransformer::parseStrict( css::util::URL& aURL ) throw( css
     return sal_False;
 }
 
-//*****************************************************************************************************************
+
 //  XURLTransformer
-//*****************************************************************************************************************
+
 sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL,
                                                 const   OUString&    sSmartProtocol  ) throw( css::uno::RuntimeException, std::exception )
 {
@@ -232,9 +231,8 @@ sal_Bool SAL_CALL URLTransformer::parseSmart( css::util::URL& aURL,
     }
 }
 
-//*****************************************************************************************************************
+
 //  XURLTransformer
-//*****************************************************************************************************************
 sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::uno::RuntimeException, std::exception )
 {
     // Safe impossible cases.
@@ -295,9 +293,9 @@ sal_Bool SAL_CALL URLTransformer::assemble( css::util::URL& aURL ) throw( css::u
     return sal_False;
 }
 
-//*****************************************************************************************************************
+
 //  XURLTransformer
-//*****************************************************************************************************************
+
 OUString SAL_CALL URLTransformer::getPresentation( const css::util::URL& aURL,
                                                             sal_Bool    bWithPassword   ) throw( css::uno::RuntimeException, std::exception )
 {
diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx
index 1469e1a53d1b..2e223256526b 100644
--- a/framework/source/tabwin/tabwindow.cxx
+++ b/framework/source/tabwin/tabwindow.cxx
@@ -45,9 +45,9 @@ using namespace com::sun::star;
 namespace framework
 {
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
+
 DEFINE_XINTERFACE_11                    (   TabWindow                                                                          ,
                                             ::cppu::OWeakObject                                                                ,
                                             DIRECT_INTERFACE( css::lang::XTypeProvider                                        ),
diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx
index 48eeffd979ea..b5486723b5f9 100644
--- a/framework/source/tabwin/tabwinfactory.cxx
+++ b/framework/source/tabwin/tabwinfactory.cxx
@@ -43,9 +43,9 @@ using namespace com::sun::star::util;
 namespace framework
 {
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
+
 DEFINE_XSERVICEINFO_ONEINSTANCESERVICE_2(   TabWinFactory                                   ,
                                             ::cppu::OWeakObject                             ,
                                             SERVICENAME_TABWINFACTORY                       ,
diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx
index bd6257e04bb7..4b52cbba2fa6 100644
--- a/framework/source/uiconfiguration/globalsettings.cxx
+++ b/framework/source/uiconfiguration/globalsettings.cxx
@@ -55,9 +55,9 @@ static const char GLOBALSETTINGS_PROPERTY_STATESENABLED[]   = "StatesEnabled";
 namespace framework
 {
 
-//*****************************************************************************************************************
+
 //  Configuration access class for WindowState supplier implementation
-//*****************************************************************************************************************
+
 
 class GlobalSettings_Access : private ThreadHelpBase                         ,  // Struct for right initalization of mutex member! Must be first of baseclasses.
                               public ::cppu::WeakImplHelper2<
@@ -95,7 +95,7 @@ class GlobalSettings_Access : private ThreadHelpBase                         ,
 };
 
 
-//*****************************************************************************************************************
+
 
 GlobalSettings_Access::GlobalSettings_Access( const css::uno::Reference< css::uno::XComponentContext >& rxContext ) :
     ThreadHelpBase(),
@@ -272,9 +272,9 @@ sal_Bool GlobalSettings_Access::impl_initConfigAccess()
     return sal_False;
 }
 
-//*****************************************************************************************************************
+
 //  global class
-//*****************************************************************************************************************
+
 
 struct mutexGlobalSettings : public rtl::Static< osl::Mutex, mutexGlobalSettings > {};
 static GlobalSettings_Access* pStaticSettings = 0;
diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx
index c3f6f2df3a05..6a577b011592 100644
--- a/framework/source/uiconfiguration/uicategorydescription.cxx
+++ b/framework/source/uiconfiguration/uicategorydescription.cxx
@@ -119,9 +119,9 @@ class ConfigurationAccess_UICategory : public ::cppu::WeakImplHelper2<XNameAcces
         IdToInfoCache                     m_aIdCache;
 };
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider
-//*****************************************************************************************************************
+
 
 ConfigurationAccess_UICategory::ConfigurationAccess_UICategory( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICategories, const Reference< XComponentContext >& rxContext ) :
     m_aConfigCategoryAccess( CONFIGURATION_ROOT_ACCESS ),
diff --git a/framework/source/uiconfiguration/windowstateconfiguration.cxx b/framework/source/uiconfiguration/windowstateconfiguration.cxx
index a1d78b2c42d3..96ec158c9c21 100644
--- a/framework/source/uiconfiguration/windowstateconfiguration.cxx
+++ b/framework/source/uiconfiguration/windowstateconfiguration.cxx
@@ -98,9 +98,9 @@ static const char* CONFIGURATION_PROPERTIES[]           =
     0
 };
 
-//*****************************************************************************************************************
+
 //  Configuration access class for WindowState supplier implementation
-//*****************************************************************************************************************
+
 
 class ConfigurationAccess_WindowState : public  ::cppu::WeakImplHelper2< XNameContainer, XContainerListener >
 {
@@ -221,7 +221,7 @@ class ConfigurationAccess_WindowState : public  ::cppu::WeakImplHelper2< XNameCo
         std::vector< OUString >           m_aPropArray;
 };
 
-//*****************************************************************************************************************
+
 
 ConfigurationAccess_WindowState::ConfigurationAccess_WindowState( const OUString& aModuleName, const Reference< XComponentContext >& rxContext ) :
     m_aConfigWindowAccess( "/org.openoffice.Office.UI." ),
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx
index 67ca57f3a945..f7ef370eb6ae 100644
--- a/framework/source/uielement/menubarwrapper.cxx
+++ b/framework/source/uielement/menubarwrapper.cxx
@@ -49,9 +49,9 @@ using namespace ::com::sun::star::ui;
 namespace framework
 {
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider
-//*****************************************************************************************************************
+
 DEFINE_XINTERFACE_11    (   MenuBarWrapper                                                    ,
                             UIConfigElementWrapperBase                                        ,
                             DIRECT_INTERFACE( ::com::sun::star::lang::XTypeProvider          ),
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index caf157bef312..6f36d557f110 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -144,7 +144,7 @@ throw ( RuntimeException, std::exception )
         m_xReceiver->statusChanged( Event );
 }
 
-//*****************************************************************************************************************
+
 
 static sal_Int16 getImageTypeFromBools( sal_Bool bBig )
 {
@@ -178,9 +178,9 @@ static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager
     return xLayoutManager;
 }
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider, XServiceInfo
-//*****************************************************************************************************************
+
 
 ToolBarManager::ToolBarManager( const Reference< XComponentContext >& rxContext,
                                 const Reference< XFrame >& rFrame,
diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx
index f7b5a357b491..aea23fa302d0 100644
--- a/framework/source/uielement/uicommanddescription.cxx
+++ b/framework/source/uielement/uicommanddescription.cxx
@@ -78,9 +78,9 @@ const sal_Int32   COMMAND_PROPERTY_MIRROR               = 4;
 namespace framework
 {
 
-//*****************************************************************************************************************
+
 //  Configuration access class for PopupMenuControllerFactory implementation
-//*****************************************************************************************************************
+
 
 class ConfigurationAccess_UICommand : // Order is necessary for right initialization!
                                         public  ::cppu::WeakImplHelper2<XNameAccess,XContainerListener>
@@ -179,9 +179,9 @@ class ConfigurationAccess_UICommand : // Order is necessary for right initializa
         sal_Bool                          m_bGenericDataRetrieved;
 };
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider
-//*****************************************************************************************************************
+
 ConfigurationAccess_UICommand::ConfigurationAccess_UICommand( const OUString& aModuleName, const Reference< XNameAccess >& rGenericUICommands, const Reference< XComponentContext>& rxContext ) :
     m_aConfigCmdAccess( CONFIGURATION_ROOT_ACCESS ),
     m_aConfigPopupAccess( CONFIGURATION_ROOT_ACCESS ),
diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx
index 05a679afb15f..3bd67f9dab05 100644
--- a/framework/source/uifactory/factoryconfiguration.cxx
+++ b/framework/source/uifactory/factoryconfiguration.cxx
@@ -56,9 +56,9 @@ OUString getHashKeyFromStrings( const OUString& aCommandURL, const OUString& aMo
     return aKey.makeStringAndClear();
 }
 
-//*****************************************************************************************************************
+
 //  XInterface, XTypeProvider
-//*****************************************************************************************************************
+
 ConfigurationAccess_ControllerFactory::ConfigurationAccess_ControllerFactory( const Reference< XComponentContext >& rxContext, const OUString& _sRoot,bool _bAskValue ) :
     ThreadHelpBase(),
     m_aPropCommand( "Command" ),