purge comments

2 files changed, 2 insertions, 26 deletions

diff --git a/sfx2/inc/sfx2/mnuitem.hxx b/sfx2/inc/sfx2/mnuitem.hxx
index dc4b17e5010e..0763115d4749 100644
--- a/sfx2/inc/sfx2/mnuitem.hxx
+++ b/sfx2/inc/sfx2/mnuitem.hxx
@@ -44,9 +44,6 @@ struct SfxMenuCtrlFactory;
 
 class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem
 {
-//friend SvStream& operator<<( SvStream& rStream, const SfxMenuControl& rItem );
-//friend SvStream& operator>>( SvStream& rStream, SfxMenuControl& rItem );
-
     String                  aTitle;
     SfxVirtualMenu*         pOwnMenu;
     SfxVirtualMenu*         pSubMenu;
@@ -70,9 +67,6 @@ public:
                                   SfxVirtualMenu& rSubMenu,
                                   const String& rTitle, SfxBindings& rBindings );
 
-//  SvStream &              Load(SvStream &, SfxBindings*);
-//  SvStream &              Store(SvStream &);
-
     String                  GetTitle() const;
     SfxVirtualMenu*         GetPopupMenu() const;
     virtual PopupMenu*      GetPopup() const;
@@ -103,8 +97,6 @@ public:
     void                    Select();
 };
 
-//--------------------------------------------------------------------
-
 typedef SfxMenuControl* (*SfxMenuControlCtor)( USHORT nId, Menu &, SfxBindings & );
 
 struct SfxMenuCtrlFactory
@@ -121,21 +113,15 @@ struct SfxMenuCtrlFactory
     {}
 };
 
-//
-
 inline String SfxMenuControl::GetTitle() const
 {
     return aTitle;
 }
-//--------------------------------------------------------------------
-
-//
 
 inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const
 {
     return pSubMenu;
 }
-//--------------------------------------------------------------------
 
 #define SFX_DECL_MENU_CONTROL() \
         static SfxMenuControl* CreateImpl( USHORT nId, Menu &rMenu, SfxBindings &rBindings ); \
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index bc3a13dfedf1..8ba182f98126 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -189,8 +189,6 @@ SfxMenuControl::SfxMenuControl( BOOL bShowStrings )
 
 //--------------------------------------------------------------------
 
-// ctor for array
-
 SfxMenuControl::SfxMenuControl():
     pOwnMenu(0),
     pSubMenu(0),
@@ -219,8 +217,6 @@ SfxMenuControl::SfxMenuControl(USHORT nSlotId, SfxBindings& rBindings):
 
 //--------------------------------------------------------------------
 
-// dtor
-
 SfxMenuControl::~SfxMenuControl()
 {
     if ( SfxMacroConfig::IsMacroSlot( GetId() ) )
@@ -244,7 +240,7 @@ void SfxMenuControl::StateChanged
     const SfxPoolItem*  pState
 )
 {
-    (void)nSID; //unused
+    (void)nSID;
     DBG_MEMTEST();
     DBG_ASSERT( nSID == GetId(), "strange SID" );
     DBG_ASSERT( pOwnMenu != 0, "setting state to dangling SfxMenuControl" );
@@ -269,19 +265,13 @@ void SfxMenuControl::StateChanged
         if ( !bIsObjMenu )
             pOwnMenu->CheckItem( GetId(), FALSE );
 
-        // SetItemText flackert in MenuBar insbes. unter OS/2 (Bug #20658)
-        if ( // !bIsObjMenu && nicht wegen "Format/Datenbank"
-             pOwnMenu->GetSVMenu()->GetItemText( GetId() ) != GetTitle() )
+        if ( pOwnMenu->GetSVMenu()->GetItemText( GetId() ) != GetTitle() )
         {
              DBG_WARNING("Title of menu item changed - please check if this needs correction!");
-            // pOwnMenu->SetItemText( GetId(), GetTitle() );
         }
         return;
     }
 
-    // ggf. das alte Enum-Menu entfernen/loeschen
-    //! delete pOwnMenu->GetMenu().ChangePopupMenu( GetId(), 0 );
-
     bool bCheck = false;
     if ( pState->ISA(SfxBoolItem) )
     {