[PATCH] about bug #61515

(https://bugs.freedesktop.org/show_bug.cgi?id=61515)

Hi, I'm Ivan Rubinson.
As requested in the page above, I have cleaned up "bogus code comments".
See diff.txt in the attachments to this email.
As requested, my changes are licensed under LGPLv3.

Have a nice day!

diff --git a/framework/source/fwe/classes/actiontriggerpropertyset.cxx 
b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
index bcde553..8e27106 100644
--- a/framework/source/fwe/classes/actiontriggerpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerpropertyset.cxx
@@ -358,9 +358,6 @@ const Sequence< Property > ActionTriggerPropertySet::impl_getStaticPropertyDescr
 }
 
 
-//******************************************************************************************************************************
-//  private method
-//******************************************************************************************************************************
 sal_Bool ActionTriggerPropertySet::impl_tryToChangeProperty(
     const   ::rtl::OUString&    sCurrentValue   ,
     const   Any&        aNewValue       ,
diff --git a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx 
b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
index c5b33ad..23c7a31 100644
--- a/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
+++ b/framework/source/fwe/classes/actiontriggerseparatorpropertyset.cxx
@@ -298,9 +298,6 @@ const Sequence< Property > ActionTriggerSeparatorPropertySet::impl_getStaticProp
 }
 
 
-//******************************************************************************************************************************
-//  private method
-//******************************************************************************************************************************
 sal_Bool ActionTriggerSeparatorPropertySet::impl_tryToChangeProperty(
     sal_Int16           aCurrentValue   ,
     const   Any&        aNewValue       ,
diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx
index f5c5218..9332f27 100644
--- a/framework/source/fwe/classes/addonmenu.cxx
+++ b/framework/source/fwe/classes/addonmenu.cxx
@@ -66,9 +66,6 @@ AddonMenu::~AddonMenu()
     }
 }
 
-// ------------------------------------------------------------------------
-
-// ------------------------------------------------------------------------
 // Check if command URL string has the unique prefix to identify addon popup menus
 sal_Bool AddonPopupMenu::IsCommandURLPrefix( const ::rtl::OUString& aCmdURL )
 {
@@ -86,8 +83,6 @@ AddonPopupMenu::~AddonPopupMenu()
 {
 }
 
-// ------------------------------------------------------------------------
-
 static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame )
 {
     // Query for the model to get check the context information
@@ -102,8 +97,6 @@ static Reference< XModel > GetModelFromFrame( const Reference< XFrame >& rFrame
     return xModel;
 }
 
-// ------------------------------------------------------------------------
-
 sal_Bool AddonMenuManager::HasAddonMenuElements()
 {
     return AddonsOptions().HasAddonsMenu();
diff --git a/framework/source/fwe/classes/addonsoptions.cxx 
b/framework/source/fwe/classes/addonsoptions.cxx
index eeaf584..8f64407 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -36,10 +36,6 @@
 #include <algorithm>
 #include <vector>
 
-//_________________________________________________________________________________________________________________
-//  namespaces
-//_________________________________________________________________________________________________________________
-
 using namespace ::std                   ;
 using namespace ::utl                   ;
 using namespace ::osl                   ;
@@ -161,10 +157,6 @@ using namespace ::com::sun::star;
 const Size  aImageSizeSmall( 16, 16 );
 const Size  aImageSizeBig( 26, 26 );
 
-//_________________________________________________________________________________________________________________
-//  private declarations!
-//_________________________________________________________________________________________________________________
-
 
/*-****************************************************************************************************************
     @descr  struct to hold information about one menu entry.
 
****************************************************************************************************************-*/
@@ -174,22 +166,10 @@ namespace framework
 
 class AddonsOptions_Impl : public ConfigItem
 {
-    
//-------------------------------------------------------------------------------------------------------------
-    //  public methods
-    
//-------------------------------------------------------------------------------------------------------------
-
     public:
-        
//---------------------------------------------------------------------------------------------------------
-        //  constructor / destructor
-        
//---------------------------------------------------------------------------------------------------------
-
          AddonsOptions_Impl();
         ~AddonsOptions_Impl();
 
-        
//---------------------------------------------------------------------------------------------------------
-        //  overloaded methods of baseclass
-        
//---------------------------------------------------------------------------------------------------------
-
         
/*-****************************************************************************************************//**
             @short      called for notify of configmanager
             @descr      These method is called from the ConfigManager before application ends or 
from the
@@ -221,10 +201,6 @@ class AddonsOptions_Impl : public ConfigItem
 
         virtual void Commit();
 
-        
//---------------------------------------------------------------------------------------------------------
-        //  public interface
-        
//---------------------------------------------------------------------------------------------------------
-
         
/*-****************************************************************************************************//**
             @short      base implementation of public interface for "SvtDynamicMenuOptions"!
             @descr      These class is used as static member of "SvtDynamicMenuOptions" ...
@@ -251,10 +227,6 @@ class AddonsOptions_Impl : public ConfigItem
 
         void                                            ReadConfigurationData();
 
-    
//-------------------------------------------------------------------------------------------------------------
-    //  private methods
-    
//-------------------------------------------------------------------------------------------------------------
-
     private:
         struct OUStringHashCode
         {
@@ -329,10 +301,6 @@ class AddonsOptions_Impl : public ConfigItem
         Sequence< OUString > GetPropertyNamesImages( const OUString& aPropertyRootNode ) const;
         sal_Bool             CreateImageFromSequence( Image& rImage, sal_Bool bBig, Sequence< 
sal_Int8 >& rBitmapDataSeq ) const;
 
-    
//-------------------------------------------------------------------------------------------------------------
-    //  private member
-    
//-------------------------------------------------------------------------------------------------------------
-
     private:
         ImageEntry* ReadOptionalImageData( const OUString& aMenuNodeName );
 
@@ -358,9 +326,6 @@ class AddonsOptions_Impl : public ConfigItem
         ToolbarMergingInstructions                        m_aCachedToolbarMergingInstructions;
 };
 
-//*****************************************************************************************************************
-//  constructor
-//*****************************************************************************************************************
 AddonsOptions_Impl::AddonsOptions_Impl()
     // Init baseclasses first
     : ConfigItem( ROOTNODE_ADDONMENU ),
@@ -419,9 +384,6 @@ AddonsOptions_Impl::AddonsOptions_Impl()
     EnableNotification( aNotifySeq );
 }
 
-//*****************************************************************************************************************
-//  destructor
-//*****************************************************************************************************************
 AddonsOptions_Impl::~AddonsOptions_Impl()
 {
     // We must save our current values .. if user forget it!
@@ -454,57 +416,36 @@ void AddonsOptions_Impl::ReadConfigurationData()
     ReadToolbarMergeInstructions( m_aCachedToolbarMergingInstructions );
 }
 
-//*****************************************************************************************************************
-//  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() )
@@ -513,9 +454,6 @@ 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() )
@@ -524,25 +462,16 @@ const OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 
nInd
         return rtl::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
@@ -557,9 +486,6 @@ bool AddonsOptions_Impl::GetMergeToolbarInstructions(
         return false;
 }
 
-//*****************************************************************************************************************
-//  public method
-//*****************************************************************************************************************
 Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool 
bNoScale ) const
 {
     Image aImage;
@@ -576,9 +502,6 @@ Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool b
     return aImage;
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& 
rAddonMenuSeq )
 {
     // Read the AddonMenu set and fill property sequences
@@ -615,9 +538,6 @@ 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
@@ -654,9 +574,6 @@ 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
@@ -710,9 +627,6 @@ sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyV
     return ( rAddonOfficeMenuBarSeq.getLength() > 0 );
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, 
std::vector< rtl::OUString >& rAddonOfficeToolBarResNames )
 {
     // Read the OfficeToolBar set and fill property sequences
@@ -734,9 +648,6 @@ sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeTo
 }
 
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const rtl::OUString rToolBarItemSetNodeName, 
Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq )
 {
     sal_Bool                    bInsertSeparator        = sal_False;
@@ -778,9 +689,6 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const rtl::OUString rToolBarIte
     return ( (sal_uInt32)rAddonOfficeToolBarSeq.getLength() > nToolBarItemCount );
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 void AddonsOptions_Impl::InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& 
rAddonOfficeToolBarSeq )
 {
     Sequence< PropertyValue >   aToolBarItem( PROPERTYCOUNT_TOOLBARITEM );
@@ -802,9 +710,6 @@ void AddonsOptions_Impl::InsertToolBarSeparator( Sequence< Sequence< PropertyVal
     rAddonOfficeToolBarSeq[nToolBarItemCount] = aToolBarItem;
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 sal_Bool AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
 {
     // Read the user-defined Images set and fill image manager
@@ -856,10 +761,6 @@ sal_Bool AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
     return sal_True;
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
-
 OUString AddonsOptions_Impl::GeneratePrefixURL()
 {
     // Create an unique prefixed Add-On popup menu URL so it can be identified later as a runtime 
popup menu.
@@ -872,10 +773,6 @@ OUString AddonsOptions_Impl::GeneratePrefixURL()
     return aPopupMenuURL;
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
-
 sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer )
 {
     const OUString aMenuMergeRootName( RTL_CONSTASCII_USTRINGPARAM( 
"AddonUI/OfficeMenuBarMerging/" ));
@@ -942,9 +839,6 @@ 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 ] );
@@ -959,9 +853,6 @@ sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstr
     return ReadSubMenuEntries( aSubMenuNodeNames, rMergeMenu );
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& 
rCachedToolbarMergingInstructions )
 {
     const OUString aToolbarMergeRootName( RTL_CONSTASCII_USTRINGPARAM( 
"AddonUI/OfficeToolbarMerging/" ));
@@ -1034,9 +925,6 @@ 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 );
@@ -1047,9 +935,6 @@ sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& 
aMergeAddonIn
     return ReadToolBarItemSet( aMergeToolbarBaseNode, rMergeToolbarItems );
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence< PropertyValue 
> & aMenuItem, sal_Bool bIgnoreSubMenu )
 {
     sal_Bool            bResult = sal_False;
@@ -1121,9 +1006,6 @@ 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;
@@ -1162,9 +1044,6 @@ 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;
@@ -1183,9 +1062,6 @@ 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;
@@ -1240,9 +1116,6 @@ 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 );
@@ -1270,18 +1143,12 @@ sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString 
> & aSu
     return sal_True;
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 sal_Bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL )
 {
     ImageManager::const_iterator pIter = m_aImageManager.find( aURL );
     return ( pIter != m_aImageManager.end() );
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 void AddonsOptions_Impl::SubstituteVariables( OUString& aURL )
 {
     if (( aURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( EXPAND_PROTOCOL )) == 0 ) )
@@ -1296,9 +1163,6 @@ void AddonsOptions_Impl::SubstituteVariables( OUString& aURL )
     }
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const OUString& aImageURL, Image& 
aImage, Image& aImageNoScale )
 {
     SvStream* pStream = UcbStreamHelper::CreateStream( aImageURL, STREAM_STD_READ );
@@ -1341,9 +1205,6 @@ void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const 
OUString&
     delete pStream;
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUString& aImageId )
 {
     const int   MAX_NUM_IMAGES = 2;
@@ -1390,9 +1251,6 @@ 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 );
@@ -1463,9 +1321,6 @@ AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const 
OUStrin
     return pEntry;
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 sal_Bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, sal_Bool bBig, Sequence< 
sal_Int8 >& rBitmapDataSeq ) const
 {
     sal_Bool    bResult = sal_False;
@@ -1510,9 +1365,6 @@ 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.
@@ -1526,9 +1378,6 @@ 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 );
@@ -1545,9 +1394,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const 
OUSt
     return lResult;
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& aPropertyRootNode 
) const
 {
     Sequence< OUString > lResult( PROPERTYCOUNT_IMAGES );
@@ -1573,9 +1419,6 @@ Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const 
OUString&
 AddonsOptions_Impl*     AddonsOptions::m_pDataContainer = NULL  ;
 sal_Int32               AddonsOptions::m_nRefCount      = 0     ;
 
-//*****************************************************************************************************************
-//  constructor
-//*****************************************************************************************************************
 AddonsOptions::AddonsOptions()
 {
     // Global access, must be guarded (multithreading!).
@@ -1589,9 +1432,6 @@ AddonsOptions::AddonsOptions()
     }
 }
 
-//*****************************************************************************************************************
-//  destructor
-//*****************************************************************************************************************
 AddonsOptions::~AddonsOptions()
 {
     // Global access, must be guarded (multithreading!)
@@ -1607,18 +1447,12 @@ AddonsOptions::~AddonsOptions()
     }
 }
 
-//*****************************************************************************************************************
-//  public method
-//*****************************************************************************************************************
 sal_Bool AddonsOptions::HasAddonsMenu() const
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
     return m_pDataContainer->HasAddonsMenu();
 }
 
-//*****************************************************************************************************************
-//  public method
-//*****************************************************************************************************************
 
 sal_Int32 AddonsOptions::GetAddonsToolBarCount() const
 {
@@ -1626,63 +1460,42 @@ 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
@@ -1692,26 +1505,17 @@ bool AddonsOptions::GetMergeToolbarInstructions(
         rToolbarName, rToolbarInstructions );
 }
 
-//*****************************************************************************************************************
-//  public method
-//*****************************************************************************************************************
 Image AddonsOptions::GetImageFromURL( const rtl::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 rtl::OUString& aURL, sal_Bool bBig ) const
 {
     return GetImageFromURL( aURL, bBig, sal_False );
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 Mutex& AddonsOptions::GetOwnStaticMutex()
 {
     // Initialize static mutex only for one time!
@@ -1734,9 +1538,6 @@ Mutex& AddonsOptions::GetOwnStaticMutex()
     return *pMutex;
 }
 
-//*****************************************************************************************************************
-//  private method
-//*****************************************************************************************************************
 IMPL_STATIC_LINK_NOINSTANCE( AddonsOptions, Notify, void*, EMPTYARG )
 {
     MutexGuard aGuard( GetOwnStaticMutex() );
diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx
index e44eadd..ea7730b 100644
--- a/framework/source/fwe/classes/bmkmenu.cxx
+++ b/framework/source/fwe/classes/bmkmenu.cxx
@@ -89,8 +89,6 @@ sal_uInt16 BmkMenu_Impl::GetMID()
     return m_nMID;
 }
 
-// ------------------------------------------------------------------------
-
 BmkMenu::BmkMenu( Reference< XFrame >& xFrame, BmkMenu::BmkMenuType nType )
     :AddonMenu(xFrame)
     ,m_nType( nType )
diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx 
b/framework/source/fwe/classes/framelistanalyzer.cxx
index f5b6a05..a48de58 100644
--- a/framework/source/fwe/classes/framelistanalyzer.cxx
+++ b/framework/source/fwe/classes/framelistanalyzer.cxx
@@ -35,9 +35,6 @@
 
 namespace framework{
 
-/**
- */
-
 FrameListAnalyzer::FrameListAnalyzer( const css::uno::Reference< css::frame::XFramesSupplier >& 
xSupplier       ,
                                       const css::uno::Reference< css::frame::XFrame >&          
xReferenceFrame ,
                                             sal_uInt32                                          
eDetectMode     )
@@ -48,9 +45,6 @@ FrameListAnalyzer::FrameListAnalyzer( const css::uno::Reference< css::frame::XFr
     impl_analyze();
 }
 
-/**
- */
-
 FrameListAnalyzer::~FrameListAnalyzer()
 {
 }
diff --git a/framework/source/fwe/classes/fwkresid.cxx b/framework/source/fwe/classes/fwkresid.cxx
index ff78bb3..1ee86e7 100644
--- a/framework/source/fwe/classes/fwkresid.cxx
+++ b/framework/source/fwe/classes/fwkresid.cxx
@@ -40,8 +40,6 @@ ResMgr* FwkResId::GetResManager()
     return pResMgr;
 }
 
-// -----------------------------------------------------------------------
-
 FwkResId::FwkResId( sal_uInt16 nId ) :
     ResId( nId, *FwkResId::GetResManager() )
 {