INTEGRATION: CWS sb59 (1.36.60); FILE MERGED

2006/08/16 09:31:24 sb 1.36.60.1: #i67487# Made code warning-free (wntmsci10).

1 files changed, 2 insertions, 1094 deletions

diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx
index 30223beadf..451cc3c808 100644
--- a/sfx2/source/menu/mnumgr.cxx
+++ b/sfx2/source/menu/mnumgr.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: mnumgr.cxx,v $
  *
- *  $Revision: 1.37 $
+ *  $Revision: 1.38 $
  *
- *  last change: $Author: obo $ $Date: 2006-09-17 16:46:49 $
+ *  last change: $Author: obo $ $Date: 2006-10-12 15:57:54 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -111,157 +111,6 @@ void TryToHideDisabledEntries_Impl( Menu* pMenu )
 }
 
 //-------------------------------------------------------------------------
-/*
-class SfxMenuIter_Impl
-{
-    String				_aCommand;
-    SfxMenuIter_Impl*	_pPrev; 	// der vorherige auf dem Stack
-    Menu*				_pMenu;		// das Men"u "uber das gerade iteriert wird
-    Menu*				_pPopup;	// Popup an dieser Pos falls noch zu durchl.
-    USHORT  			_nPos;		// die Position des Iterators in 'pMenu'
-    USHORT				_nId;		// Id an Position '_nPos'
-    USHORT				_nLevel;	// Schachteltiefe
-
-                        SfxMenuIter_Impl( Menu *pMenu,
-                                          SfxMenuIter_Impl *pPrev = 0 );
-
-                        ~SfxMenuIter_Impl()
-                        {}
-
-public:
-    static SfxMenuIter_Impl* Create( Menu *pMenu )
-                        { return ( pMenu && pMenu->GetItemCount() )
-                                    ? new SfxMenuIter_Impl( pMenu )
-                                    : 0; }
-
-    String				GetCommand() const
-                        { return _aCommand; }
-
-    USHORT				GetLevel() const
-                        { return _nLevel; }
-
-    Menu*   			GetMenu() const
-                        { return _pMenu; }
-
-    USHORT				GetItemId() const
-                        { return _nId; }
-
-    MenuItemType		GetItemType() const
-                        { return _pMenu->GetItemType( _nPos ); }
-
-    Menu*				GetPopupMenu() const
-                        { return _pPopup; }
-
-    String   			GetItemText() const
-                        { return _pMenu->GetItemText( _nId ); }
-
-    String  	 		GetItemHelpText() const
-                        { return _pMenu->GetHelpText( _nId ); }
-
-    BOOL				IsSeparator() const
-                        { return MENUITEM_SEPARATOR == GetItemType(); }
-
-    BOOL                IsBinding( SfxModule* pMod ) const;
-
-    SfxMenuIter_Impl*	NextItem();
-
-    void 				RemovePopup()
-                        { _pPopup = NULL; }
-};
-
-//=========================================================================
-
-SfxMenuIter_Impl::SfxMenuIter_Impl
-(
-    Menu*				pMenu,
-    SfxMenuIter_Impl*	pPrev
-)
-:	_pPrev( pPrev ),
-    _pMenu( pMenu ),
-    _nPos( 0 ),
-    _nId( pMenu->GetItemId(0) ),
-    _nLevel( pPrev ? ( pPrev->_nLevel + 1 ) : 0 )
-{
-    _aCommand = pMenu->GetItemCommand( _nId );
-    if ( _aCommand.CompareToAscii("slot:", 5) == 0 )
-        _aCommand.Erase();
-
-    _pPopup = pMenu->GetPopupMenu( _nId );
-}
-
-//--------------------------------------------------------------------
-
-SfxMenuIter_Impl* SfxMenuIter_Impl::NextItem()
-{
-    // noch nicht durchlaufenes Popup vorhanden
-    if ( _pPopup )
-    {
-        // dann bevor es weitergeht, das Popup durchlaufen
-        Menu *pSub = _pPopup;
-        _pPopup = 0; // als durchlaufen markieren
-        if ( pSub->GetItemCount() )
-            return new SfxMenuIter_Impl( pSub, this );
-    }
-
-    // zur n"achsten Position in diesem Men"u
-    if ( ++_nPos >=_pMenu->GetItemCount() )
-    {
-        // Men"u zuende => eine Stack-Etage hoch
-        SfxMenuIter_Impl *pPrev = _pPrev;
-        delete this;
-        return pPrev ? pPrev->NextItem() : 0;
-    }
-
-    // bleibt in diesem Menu
-    _nId = _pMenu->GetItemId(_nPos);
-    _aCommand = _pMenu->GetItemCommand( _nId );
-    if ( _aCommand.CompareToAscii("slot:", 5) == 0 )
-        _aCommand.Erase();
-    _pPopup = _pMenu->GetPopupMenu(_nId);
-
-    // nicht alles wird angezeigt
-    if ( _nId >= START_ITEMID_PICKLIST && _nId <= END_ITEMID_PICKLIST )
-        return NextItem();
-
-    if ( _nId >= START_ITEMID_WINDOWLIST && _nId <= END_ITEMID_WINDOWLIST )
-        return NextItem();
-
-    if (( _nId == SID_ADDONS ) || ( _nId == SID_ADDONHELP ))
-    {
-        _pPopup = 0;
-        return NextItem();
-    }
-
-    // nicht alle Popups werden durchlaufen
-    if ( _nId == SID_OBJECT ||
-         ( _nId >= SID_OBJECTMENU0 && _nId <= SID_OBJECTMENU_LAST ) )
-        _pPopup = 0;
-
-    // Jump over the merged addon popup menus. They shouldn't be stored
-    // nor be configurable by the user.
-    if ( framework::AddonPopupMenu::IsCommandURLPrefix( _aCommand ))
-    {
-        _pPopup = 0;
-        return NextItem();
-    }
-
-    if ( framework::AddonMenuManager::IsAddonMenuId( _nId ))
-        return NextItem();
-
-    // diesen Eintrag nehmen
-    return this;
-}
-
-BOOL SfxMenuIter_Impl::IsBinding( SfxModule* pMod ) const
-{
-    if ( GetPopupMenu() && _nId > SID_SFX_START )
-        if ( !SfxMenuControl::IsSpecialControl( _nId, pMod ) )
-            // "Unechtes" Binding: Popup mit SlotId
-            return FALSE;
-    return _nId >= SID_SFX_START || ( GetCommand().Len() != 0);
-}
-*/
-//--------------------------------------------------------------------
 
 SfxMenuManager::SfxMenuManager( const ResId& rResId, SfxBindings &rBindings )
 :   pMenu(0),
@@ -297,16 +146,6 @@ void SfxMenuManager::Construct( SfxVirtualMenu& rMenu )
     TryToHideDisabledEntries_Impl( pSvMenu );
 }
 
-//--------------------------------------------------------------------
-/*
-BOOL SfxMenuManager::Store( SvStream& rStream )
-{
-    DBG_MEMTEST();
-    SfxDispatcher* pDisp = pBindings->GetDispatcher_Impl();
-    SfxModule *pMod = pDisp ? SFX_APP()->GetActiveModule( pDisp->GetFrame() ) :0;
-    return StoreMenu( rStream, pMenu->GetSVMenu(), pMod );
-}
-*/
 //-------------------------------------------------------------------------
 void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs, Menu* pMenu )
 {
@@ -338,58 +177,7 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen
         }
     }
 }
-/*
-void SfxMenuManager::InsertVerbs(const com::sun::star::uno::Sequence < com::sun::star::embed::VerbDescriptor >& aVerbs)
-
-{
-    Menu *pMenu = GetMenu()->GetSVMenu();
-    InsertVerbs_Impl( pBindings, aVerbs, pMenu );
-}
-
-//-------------------------------------------------------------------------
-
-BOOL SfxMenuManager::StoreMenu( SvStream& rStream, Menu* pMenu, SfxModule* pMod )
-{
-    return TRUE;
-}
-
-//-------------------------------------------------------------------------
-
-void SfxMenuManager::SetForceCtrlCreateMode( BOOL bCreate )
-{
-    bOLE = bCreate;
-}
 
-//-------------------------------------------------------------------------
-
-Menu* SfxMenuManager::LoadMenu( SvStream& rStream )
-{
-    return NULL;
-}
-
-int SfxMenuManager::Load( SvStream& rStream )
-{
-    DBG_MEMTEST();
-
-    if ( !bMenuBar )
-    {
-        UseDefault();
-    }
-    else
-    {
-        Menu* pSVMenu = LoadMenu( rStream );
-        if ( pSVMenu )
-        {
-            Construct_Impl( pSVMenu, FALSE );
-            SetDefault( FALSE );
-        }
-        else
-            UseDefault();
-    }
-
-    return SfxConfigItem::ERR_OK;
-}
-*/
 //--------------------------------------------------------------------
 
 void SfxMenuManager::UseDefault()
@@ -405,25 +193,6 @@ void SfxMenuManager::UseDefault()
     }
 
     SfxVirtualMenu *pVMenu = 0;
-    /*
-    if ( bMenuBar )
-    {
-        ResId aId( GetType(), pResMgr );
-        aId.SetRT(RSC_MENU);
-        if ( Resource::GetResManager()->IsAvailable( aId ) )
-        {
-            MenuBar *pSvMenu = new MenuBar( ResId(GetType(), pResMgr) );
-            SfxMenuManager::EraseItemCmds( pSvMenu ); // Remove .uno cmds to be compatible with 6.0/src641
-            TryToHideDisabledEntries_Impl( pSvMenu );
-            pVMenu = new SfxVirtualMenu( pSvMenu, FALSE, *pBindings, bOLE, TRUE );
-        }
-        else
-        {
-            MenuBar *pSvMenu = new MenuBar;
-            pVMenu = new SfxVirtualMenu( pSvMenu, FALSE, *pBindings, bOLE, TRUE );
-        }
-    }
-    else    */
     {
         ResId aResId(GetType());
         aResId.SetRT(RSC_MENU);
@@ -458,301 +227,14 @@ void SfxMenuManager::UseDefault()
     }
 
     Construct(*pVMenu);
-/*
-    if ( bMenuBar && pOldVirtMenu )
-    {
-        SfxMenuBarManager *pBar = (SfxMenuBarManager*) this;
-        MenuBar* pOldBar = (MenuBar*) pOldVirtMenu->GetSVMenu();
-        MenuBar* pSvBar = (MenuBar*) GetMenu()->GetSVMenu();
-        if ( pBar->GetWindow()->GetMenuBar() == pOldBar )
-            pBar->GetWindow()->SetMenuBar( pSvBar );
-    }
-*/
     if (pOldVirtMenu)
     {
         delete pOldVirtMenu;
         pBindings->LEAVEREGISTRATIONS();
     }
-
-    //SetDefault( TRUE );
 }
 
 // ------------------------------------------------------------------------
-/*
-String SfxMenuManager::GetStreamName() const
-{
-    return SfxConfigItem::GetStreamName( GetType() );
-}
-
-//--------------------------------------------------------------------
-
-// Baut aus einem ConfigItemArray rekursiv das StarView-Menu auf
-
-void SfxMenuManager::ConstructSvMenu( Menu* pSuper, SfxMenuCfgItemArr& rCfg)
-{
-    // USHORT nCount = rCfg.Count();
-    for ( USHORT n = 0; n < rCfg.Count(); ++n )
-    {
-        USHORT nId = rCfg[n]->nId;
-        if ( rCfg[n]->pPopup )
-        {
-            pSuper->InsertItem( nId, rCfg[n]->aTitle );
-            pSuper->SetHelpId( nId, (ULONG) nId );
-            PopupMenu *pPopupMenu;
-            pPopupMenu = new PopupMenu;
-            pSuper->SetPopupMenu( nId, pPopupMenu );
-            ConstructSvMenu( pPopupMenu, *(rCfg[n]->pPopup) );
-        }
-        else if ( nId )
-        {
-            pSuper->InsertItem( nId, rCfg[n]->aTitle );
-            if ( SfxMacroConfig::IsMacroSlot( nId ) )
-            {
-                SfxMacroInfo* pInfo = SFX_APP()->GetMacroConfig()->GetMacroInfo(nId);
-                if ( pInfo )
-                {
-                    SFX_APP()->GetMacroConfig()->RegisterSlotId( nId );
-                    pSuper->SetItemCommand( nId, pInfo->GetURL() );
-                }
-            }
-            else if ( rCfg[n]->aCommand.Len() )
-            {
-                pSuper->SetItemCommand( nId, rCfg[n]->aCommand );
-                pSuper->SetHelpId( nId, (ULONG) nId ); // Set help id even if we have a command
-            }
-            else
-            {
-                pSuper->SetHelpId( nId, (ULONG) nId );
-            }
-        }
-        else
-        {
-            pSuper->InsertSeparator();
-        }
-    }
-}
-
-//--------------------------------------------------------------------
-
-// Baut aus einem ConfigStream rekursiv das StarView-Menu auf
-
-void SfxMenuManager::ConstructSvMenu( Menu* pSuper, SvStream& rStream,
-        BOOL bWithHelp, BOOL bCompat )
-{
-    SvUShorts aShorts;
-
-    USHORT nCount = 0xFFFF;
-    if ( bCompat )
-    {
-        // Alte Eintr"age wg. Kompatibilit"at einlesen
-        USHORT nCtrls,nId;
-        rStream >> nCtrls;
-        for (USHORT i=0; i<nCtrls; i++)
-            rStream >> nId;
-        rStream >> nCount;
-    }
-
-    rtl_TextEncoding nEnc = osl_getThreadTextEncoding();
-
-    char cTag;
-    for ( USHORT n=0; n<nCount; n++ )
-    {
-        rStream >> cTag;
-        String aTitle;
-        USHORT nId;
-
-        switch ( cTag )
-        {
-            case 'S':
-                pSuper->InsertSeparator();
-                break;
-
-            case 'I':
-            {
-                rStream >> nId;
-                rStream.ReadByteString( aTitle, nEnc );
-
-                String aHelpText;
-                if ( bWithHelp )
-                    rStream.ReadByteString( aHelpText, nEnc );
-
-                if ( SfxMacroConfig::IsMacroSlot(nId) )
-                {
-                    SfxMacroInfo aInfo;
-                    rStream >> aInfo;
-//                    nId = aInfo.GetSlotId();
-                }
-
-                pSuper->InsertItem( nId, aTitle );
-                pSuper->SetHelpId( nId, (ULONG) nId );
-                if ( bWithHelp )
-                    pSuper->SetHelpText( nId, aHelpText );
-
-                if ( nId >= SID_OBJECTMENU0 && nId <= SID_OBJECTMENU_LAST )
-                {
-                    // our new menu configuration must have an empty popupmenu, iut doesn't allow for
-                    // menu entries without popups in the menubar root
-                    PopupMenu *pPopupMenu;
-                    pPopupMenu = new PopupMenu;
-                    pSuper->SetPopupMenu( nId, pPopupMenu );
-                }
-
-                break;
-            }
-
-            case 'P':
-            {
-                rStream >> nId;
-                rStream.ReadByteString( aTitle, nEnc );
-
-                if ( SfxMacroConfig::IsMacroSlot(nId) || nId < SID_SFX_START )
-                {
-                    // Bug im Cfg-Dialog: Popups mit Macro-SlotIds
-                    USHORT i;
-                    for ( i=0; i<aShorts.Count(); i++ )
-                    {
-                        // Erste Id nehmen, deren Wert gr"o\ser ist als die Position
-                        if ( aShorts[i] > i+1 )
-                            break;
-                    }
-
-                    nId = i+1;
-                    aShorts.Insert( nId, i );
-                }
-
-                String aHelpText;
-                if ( bWithHelp )
-                    rStream.ReadByteString( aHelpText, nEnc );
-
-                pSuper->InsertItem( nId, aTitle );
-                pSuper->SetHelpId( nId, (ULONG) nId );
-                if ( bWithHelp )
-                    pSuper->SetHelpText( nId, aHelpText );
-
-                PopupMenu *pPopupMenu;
-                pPopupMenu = new PopupMenu;
-                pSuper->SetPopupMenu( nId, pPopupMenu );
-                ConstructSvMenu( pPopupMenu, rStream, bWithHelp, bCompat );
-                break;
-            }
-
-            case 'E':
-            {
-                n = nCount-1;				// Ende
-                break;
-            }
-
-            default:
-            {
-                // Wenn ein Fehler aufgetreten ist, sollte man besser aufh"oren
-                DBG_ERROR( "invalid item type in menu-config" );
-                n = nCount-1;				// Ende
-                break;
-            }
-        }
-    }
-}
-
-//--------------------------------------------------------------------
-
-// append a binding by function-id
-
-void SfxMenuManager::AppendItem(const String &rText,
-                                const String &rHelpText, USHORT nId, const String &rCommand )
-{
-    SfxMenuCfgItem* pItem = new SfxMenuCfgItem;
-    pItem->nId = nId;
-    pItem->aTitle = rText;
-    pItem->aHelpText = rHelpText;
-    pItem->aCommand = rCommand;
-    pItem->pPopup = 0;
-    pCfgStack->Top()->Append( pItem );
-}
-
-//--------------------------------------------------------------------
-
-// append a separator
-
-void SfxMenuManager::AppendSeparator()
-{
-    SfxMenuCfgItem* pItem = new SfxMenuCfgItem;
-    pItem->nId = 0;
-    pItem->pPopup = 0;
-    pCfgStack->Top()->Append( pItem );
-}
-
-//--------------------------------------------------------------------
-
-// append a popup (sub)-menu
-
-void SfxMenuManager::EnterPopup(const String& rTitle,
-                                const String& rHelpText, USHORT nId )
-{
-    SfxMenuCfgItem* pItem = new SfxMenuCfgItem;
-    pItem->nId = nId;
-    pItem->aTitle = rTitle;
-    pItem->aHelpText = rHelpText;
-    pItem->pPopup = new SfxMenuCfgItemArr;
-    pCfgStack->Top()->Append( pItem );
-    pCfgStack->Push( pItem->pPopup );
-}
-
-//--------------------------------------------------------------------
-
-// end a sub-menu
-
-void SfxMenuManager::LeavePopup()
-{
-    SfxMenuCfgItemArr* pArr = pCfgStack->Top();
-    SvUShorts aShorts;
-
-    USHORT n;
-    for ( n=0; n<pArr->Count(); n++ )
-    {
-        USHORT nId = (*pArr)[n]->nId;
-        if ( nId < SID_SFX_START )
-        {
-            // Alle vewendeten Popup-Ids < 5000 merken
-            USHORT i;
-            for ( i=0; i<aShorts.Count(); i++ )
-            {
-                if ( aShorts[i] > nId )
-                    break;
-            }
-
-            aShorts.Insert( nId, i );
-        }
-    }
-
-    for ( n=0; n<pArr->Count(); n++ )
-    {
-        SfxMenuCfgItem* pItem = (*pArr)[n];
-        if ( pItem->pPopup && SfxMacroConfig::IsMacroSlot(pItem->nId) )
-        {
-            // Weil in dem Fucking-ConfigDialog Entries und Popups bunt
-            // vermischt sind, kann auch ein Popup eine Macro-Id haben, die
-            // mu\s nat"urlich weg
-            SFX_APP()->GetMacroConfig()->ReleaseSlotId( pItem->nId );
-
-            // Nun noch eine erlaubte Id suchen
-            USHORT nCount = aShorts.Count();
-            USHORT i;
-            for ( i=0; i<nCount; i++ )
-            {
-                if ( aShorts[i] > i+1 )
-                // Erste Id nehmen, deren Wert gr"o\ser ist als die Position
-                    break;
-            }
-
-            pItem->nId = i+1;
-            aShorts.Insert( i+1, i );
-        }
-    }
-
-    pCfgStack->Pop();
-}
-*/
-//--------------------------------------------------------------------
 
 // executes the function for the selected item
 IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
@@ -777,192 +259,6 @@ IMPL_LINK( SfxMenuManager, Select, Menu *, pSelMenu )
 
 //--------------------------------------------------------------------
 
-// resets the item iterator, FALSE if none
-/*
-BOOL SfxMenuManager::FirstItem()
-{
-    pIterator = SfxMenuIter_Impl::Create( pMenu->GetSVMenu() );
-    return 0 != pIterator;
-}
-
-//--------------------------------------------------------------------
-
-// skips to the next item, FALSE if no more
-
-BOOL SfxMenuManager::NextItem()
-{
-    DBG_ASSERT( pIterator, "invalid iterator state" );
-
-    pIterator = pIterator->NextItem();
-    return 0 != pIterator;
-}
-
-//--------------------------------------------------------------------
-
-// TRUE if current item is a binding
-
-BOOL SfxMenuManager::IsBinding() const
-{
-    DBG_ASSERT( pIterator, "invalid iterator state" );
-    SfxDispatcher* pDisp = pBindings->GetDispatcher_Impl();
-    SfxModule *pMod = pDisp ? SFX_APP()->GetActiveModule( pDisp->GetFrame() ) :0;
-    return pIterator->IsBinding( pMod );
-}
-
-String SfxMenuManager::GetCommand() const
-{
-    DBG_ASSERT( pIterator, "invalid iterator state" );
-    return pIterator->GetCommand();
-}
-
-//--------------------------------------------------------------------
-
-// TRUE if current item is a separator
-
-BOOL SfxMenuManager::IsSeparator() const
-{
-    DBG_ASSERT( pIterator, "invalid iterator state" );
-
-    return pIterator->IsSeparator();
-}
-
-//--------------------------------------------------------------------
-
-// TRUE if current item is a popup; may be also a binding
-
-BOOL SfxMenuManager::IsPopup() const
-{
-    DBG_ASSERT( pIterator, "invalid iterator state" );
-
-    return 0 != pIterator->GetPopupMenu();
-}
-
-//--------------------------------------------------------------------
-
-// returns sub-menu-level
-
-USHORT SfxMenuManager::GetLevel() const
-{
-    DBG_ASSERT( pIterator, "invalid iterator state" );
-
-    return pIterator->GetLevel();
-}
-
-//--------------------------------------------------------------------
-
-// id of binding if IsBinding()
-
-USHORT SfxMenuManager::GetItemId() const
-{
-    DBG_ASSERT( pIterator, "invalid iterator state" );
-
-#ifdef DBG_UTIL
-    ByteString aStr( U2S(pIterator->GetItemText()) );
-#endif
-
-    USHORT nId = pIterator->GetItemId();
-
-#ifdef DBG_UTIL
-    const SfxSlot *pSlot = nId ? SFX_SLOTPOOL().GetSlot( nId ) : NULL;
-    if ( pSlot && !pSlot->IsMode( SFX_SLOT_MENUCONFIG ) && nId != SID_MDIWINDOWLIST )
-    {
-        ByteString aStr( "Slot ");
-        aStr += ByteString::CreateFromInt32( nId );
-        aStr += ByteString( " : MenuConfig fehlt!" );
-        DBG_ERROR( aStr.GetBuffer() );
-    }
-#endif
-
-    if ( pIterator->GetPopupMenu() )
-    {
-#if defined( DBG_UTIL ) && !defined( WIN )
-        aStr += ByteString( " : Popups muessen Ids != 0 haben!" );
-        DBG_ASSERT( nId, aStr.GetBuffer() );
-#endif
-        return nId;
-    }
-    else if ( pIterator->GetCommand().Len() )
-    {
-        return nId;
-    }
-    else
-    {
-#if defined( DBG_UTIL ) && !defined( WIN )
-        aStr += ByteString( " : Menue-Entries muessen Ids > SID_SFX_START haben!" );
-        DBG_ASSERT( nId > SID_SFX_START || pIterator->IsSeparator(), aStr.GetBuffer() );
-#endif
-        return nId > SID_SFX_START ? nId : SID_NONE;
-    }
-}
-
-//--------------------------------------------------------------------
-
-// title of popup if IsPopup()
-
-String SfxMenuManager::GetTitle() const
-{
-    DBG_ASSERT( pIterator, "invalid iterator state" );
-
-    return pIterator->GetItemText();
-}
-
-//--------------------------------------------------------------------
-
-String SfxMenuManager::GetHelpText() const
-{
-    DBG_ASSERT( pIterator, "invalid iterator state" );
-
-    return pIterator->GetItemHelpText();
-}
-
-//--------------------------------------------------------------------
-
-// call this before reconfiguring
-
-void SfxMenuManager::Clear()
-{
-    pBindings->ENTERREGISTRATIONS();
-    pOldMenu = pMenu;
-
-    // create the root config and a stack for the current sub-configs
-    pCfg = new SfxMenuCfgItemArr;
-    pCfgStack = new SfxMenuCfgItemArrStack;
-    pCfgStack->Push( pCfg );
-}
-
-//--------------------------------------------------------------------
-
-// call this after reconfiguring
-
-void SfxMenuManager::Reconfigure()
-{
-    SfxVirtualMenu *pVMenu;
-    Menu *pSVMenu;
-    if ( bMenuBar )
-        pSVMenu = new MenuBar;
-    else
-        pSVMenu = new PopupMenu;
-
-    TryToHideDisabledEntries_Impl( pSVMenu );
-    ConstructSvMenu( pSVMenu, *pCfg );
-
-    pVMenu = new SfxVirtualMenu( pSVMenu, FALSE, *pBindings, FALSE );
-    Construct(*pVMenu);
-    if ( bMenuBar && pOldMenu )
-    {
-        SfxMenuBarManager *pBar = (SfxMenuBarManager*) this;
-        MenuBar* pOldBar = (MenuBar*) pOldMenu->GetSVMenu();
-        MenuBar* pSvBar = (MenuBar*) GetMenu()->GetSVMenu();
-        if ( pBar->GetWindow() && pBar->GetWindow()->GetMenuBar() == pOldBar )
-            pBar->GetWindow()->SetMenuBar( pSvBar );
-    }
-
-    delete pOldMenu;
-    pOldMenu = 0;
-    pBindings->LEAVEREGISTRATIONS();
-    SetDefault( FALSE );
-}
-*/
 void SfxMenuManager::Construct_Impl( Menu* pSVMenu, BOOL bWithHelp )
 {
     SfxVirtualMenu *pOldVirtMenu=0;
@@ -977,15 +273,6 @@ void SfxMenuManager::Construct_Impl( Menu* pSVMenu, BOOL bWithHelp )
     SfxVirtualMenu *pVMenu = new SfxVirtualMenu( pSVMenu, bWithHelp, *pBindings, TRUE );
     Construct(*pVMenu);
 
-    /*if ( bMenuBar && pOldVirtMenu )
-    {
-        SfxMenuBarManager *pBar = (SfxMenuBarManager*) this;
-        MenuBar* pOldBar = (MenuBar*) pOldVirtMenu->GetSVMenu();
-        MenuBar* pSvBar = (MenuBar*) GetMenu()->GetSVMenu();
-        if ( pBar->GetWindow()->GetMenuBar() == pOldBar )
-            pBar->GetWindow()->SetMenuBar( pSvBar );
-    } */
-
     if ( pOldVirtMenu )
     {
         delete pOldVirtMenu;
@@ -995,323 +282,6 @@ void SfxMenuManager::Construct_Impl( Menu* pSVMenu, BOOL bWithHelp )
 
 //--------------------------------------------------------------------
 
-// reload all KeyCodes
-/*
-void SfxMenuManager::InvalidateKeyCodes()
-{
-    if ( pMenu )
-        pMenu->InvalidateKeyCodes();
-}
-
-// ------------------------------------------------------------------------
-
-BOOL SfxMenuManager::IsPopupFunction( USHORT nId )
-{
-    return nId == SID_PICKLIST ||
-           nId == SID_MDIWINDOWLIST ||
-           nId == SID_HELPMENU ||
-           nId == SID_ADDONLIST;
-}
-
-//--------------------------------------------------------------------
-
-// creates a menu-manager and loads it from a resource
-
-SfxMenuBarManager::SfxMenuBarManager( const ResId& rResId, SfxBindings &rBindings, SfxConfigManager* pMgr, BOOL bOLE )
-    : SfxMenuManager( rResId, rBindings, pMgr, TRUE )
-    , pWindow( rBindings.GetSystemWindow() )
-    , bDowning( FALSE )
-{
-    DBG_MEMTEST();
-
-    // initialize ObjectMenus
-    for ( int n = 0; n < 4; ++n )
-    {
-        aObjMenus[n].nId = 0;
-        aObjMenus[n].pPMMgr = NULL;
-        aObjMenus[n].pResMgr = NULL;
-    }
-
-    // #107258# full menu bar hierarchy is needed, if accessibility is enabled
-    BOOL bAccessibilityEnabled = Application::GetSettings().GetMiscSettings().GetEnableATToolSupport();
-    SetForceCtrlCreateMode( bOLE || bAccessibilityEnabled );
-
-    Initialize();
-}
-
-SfxMenuBarManager::SfxMenuBarManager( const SfxMenuBarManager& rOther, SfxConfigManager* pMgr )
-    : SfxMenuManager( ResId( rOther.GetType(), rOther.GetResMgr() ), (SfxBindings&) rOther.GetBindings(), pMgr, TRUE )
-    , pWindow( NULL )
-    , bDowning( FALSE )
-{
-    DBG_MEMTEST();
-
-    // initialize ObjectMenus
-    for ( int n = 0; n < 4; ++n )
-    {
-        aObjMenus[n].nId =     rOther.aObjMenus[n].nId;
-        aObjMenus[n].pPMMgr =  0;
-        aObjMenus[n].pResMgr = rOther.aObjMenus[n].pResMgr;
-    }
-
-    Initialize();
-}
-
-SfxMenuBarManager::~SfxMenuBarManager()
-{
-    DBG_MEMTEST();
-
-    DBG_ASSERT(!aObjMenus[0].pPMMgr || !aObjMenus[1].pPMMgr ||
-               !aObjMenus[2].pPMMgr || !aObjMenus[3].pPMMgr,
-               "da sind noch ObjectMenus" );
-
-    bDowning = TRUE;
-    ResetObjectMenus();
-    UpdateObjectMenus();
-
-    MenuBar* pSvBar = (MenuBar*) GetMenu()->GetSVMenu();
-    if ( pWindow && pWindow->GetMenuBar() == pSvBar )
-        pWindow->SetMenuBar( 0 );
-}
-
-
-SvStream* SfxMenuBarManager::GetDefaultStream( StreamMode nMode )
-{
-    String aUserConfig = SvtPathOptions().GetUserConfigPath();
-    INetURLObject aObj( aUserConfig );
-    aObj.insertName( GetStreamName() );
-    return ::utl::UcbStreamHelper::CreateStream( aObj.GetMainURL( INetURLObject::NO_DECODE ), nMode );
-}
-
-BOOL SfxMenuBarManager::Load( SvStream& rStream, BOOL bOLEServer )
-{
-    SetForceCtrlCreateMode( bOLEServer );
-    Menu *pSVMenu = LoadMenuBar( rStream );
-    if ( pSVMenu )
-        Construct_Impl( pSVMenu, FALSE );
-    return ( pSVMenu != NULL );
-}
-
-//------------------------------------------------------------------------
-// To be compatible to 6.0/src641 we have to erase .uno commands we got
-// from resource file. Otherwise these commands get saved to our XML configurations
-// files and 6.0/src641 is not able to map these to slot ids again!!!
-void SfxMenuManager::EraseItemCmds( Menu* pMenu )
-{
-    USHORT nCount = pMenu->GetItemCount();
-    for ( USHORT nSVPos = 0; nSVPos < nCount; nSVPos++ )
-    {
-        USHORT nId = pMenu->GetItemId( nSVPos );
-        PopupMenu* pPopupMenu = pMenu->GetPopupMenu( nId );
-        if ( pPopupMenu )
-            EraseItemCmds( pPopupMenu );
-        else if ( nId > 0 )
-        {
-            // Remove .uno commands to be compatible with 6.0/src641
-            String aCommand = pMenu->GetItemCommand( nId );
-            if ( aCommand.CompareToAscii(".uno:", 5 ) == COMPARE_EQUAL )
-                pMenu->SetItemCommand( nId, String() );
-        }
-    }
-}
-
-
-//------------------------------------------------------------------------
-// Restore the correct macro ID so that menu items with an associated accelerator
-// are correctly identified. This ensures that the accelerator info is displayed in
-// the menu.
-void SfxMenuManager::RestoreMacroIDs( Menu* pMenu )
-{
-    USHORT nCount = pMenu->GetItemCount();
-    for ( USHORT nSVPos = 0; nSVPos < nCount; nSVPos++ )
-    {
-        USHORT nId = pMenu->GetItemId( nSVPos );
-        PopupMenu* pPopupMenu = pMenu->GetPopupMenu( nId );
-        if ( pPopupMenu )
-            RestoreMacroIDs( pPopupMenu );
-        else if ( nId < SID_SFX_START )
-        {
-            // Restore a valid ID for macro commands!
-            String aCommand = pMenu->GetItemCommand( nId );
-            if ( aCommand.CompareToAscii("macro:", 6 ) == COMPARE_EQUAL )
-            {
-                String	aTitle		= pMenu->GetItemText( nId );
-                String	aHelpText	= pMenu->GetHelpText( nId );
-                ULONG	nHelpId		= pMenu->GetHelpId( nId );
-                MenuItemBits nBits	= pMenu->GetItemBits( nId );
-
-                SfxMacroInfo aInfo( aCommand );
-                SFX_APP()->GetMacroConfig()->GetSlotId( &aInfo );
-                nId = aInfo.GetSlotId();
-
-                pMenu->RemoveItem( nSVPos );
-                pMenu->InsertItem( nId, aTitle, nBits, nSVPos );
-                pMenu->SetHelpText( nId, aHelpText );
-                pMenu->SetHelpId( nId, nHelpId );
-            }
-        }
-    }
-}
-
-//------------------------------------------------------------------------
-
-MenuBar* SfxMenuBarManager::LoadMenuBar( SvStream& rStream )
-{
-    return NULL;
-}
-
-//------------------------------------------------------------------------
-
-BOOL SfxMenuBarManager::StoreMenuBar( SvStream& rStream, MenuBar* pMenuBar )
-{
-    return FALSE;
-}
-
-//------------------------------------------------------------------------
-
-void SfxMenuBarManager::ResetObjectMenus()
-{
-    for ( int n = 0; n <= 3; ++n )
-        aObjMenus[n].nId = 0;
-}
-
-//------------------------------------------------------------------------
-
-void SfxMenuBarManager::SetObjectMenu( USHORT nPos, const ResId& rResId )
-{
-    nPos -= SID_OBJECTMENU0;
-    DBG_ASSERT( nPos < 4, "only 4 object Menu positions defined" );
-
-    aObjMenus[nPos].nId = rResId.GetId();
-    aObjMenus[nPos].pResMgr = rResId.GetResMgr();
-}
-
-
-//------------------------------------------------------------------------
-
-MenuBar* SfxMenuBarManager::GetMenuBar() const
-{
-    return (MenuBar*) GetMenu()->GetSVMenu();
-}
-
-//------------------------------------------------------------------------
-
-PopupMenu* SfxMenuBarManager::GetObjectMenu( USHORT nPos, USHORT &rConfigId )
-{
-    nPos -= SID_OBJECTMENU0;
-    DBG_ASSERT( nPos < 4, "only 4 object Menu positions defined" );
-
-    rConfigId = aObjMenus[nPos].nId;
-    return aObjMenus[nPos].pPMMgr
-            ? (PopupMenu*) aObjMenus[nPos].pPMMgr->GetMenu()->GetSVMenu()
-            : 0;
-}
-
-//------------------------------------------------------------------------
-
-void SfxMenuBarManager::UpdateObjectMenus()
-{
-    Menu *pMenu = GetMenu()->GetSVMenu();
-    for ( int n = 0; n < 4; ++n )
-    {
-        SfxPopupMenuManager *pOldPopup = aObjMenus[n].pPMMgr;
-
-        // check if this object menue is in the menubar at all
-        USHORT nId = n + SID_OBJECTMENU0;
-        BOOL bInMenu = ( pMenu->GetItemPos( nId ) != MENU_ITEM_NOTFOUND );
-        PopupMenu* pOldSVPopup = pMenu->GetPopupMenu( nId );
-
-        if ( aObjMenus[n].nId )
-        {
-            if ( bInMenu )
-            {
-                if ( !pOldPopup && pOldSVPopup )
-                {
-                    // remove dummy popup
-                    pMenu->SetPopupMenu( nId, 0 );
-                    delete pOldSVPopup;
-                }
-
-                if ( !pOldPopup || ( pOldPopup && pOldPopup->GetType() != aObjMenus[n].nId ) )
-                {
-                    ResId aResId( aObjMenus[n].nId, aObjMenus[n].pResMgr );
-                    aObjMenus[n].pPMMgr =
-                        new SfxPopupMenuManager( aResId , GetBindings() );
-                    aObjMenus[n].pPMMgr->Initialize();
-                }
-                else
-                    // popups remains the same, prevent deletion
-                    pOldPopup = NULL;
-
-                pMenu->SetPopupMenu( nId, (PopupMenu*) aObjMenus[n].pPMMgr->GetMenu()->GetSVMenu() );
-                pMenu->EnableItem( nId, TRUE );
-            }
-        }
-        else if ( pOldPopup )
-        {
-            if ( pMenu->GetItemPos( nId ) != MENU_ITEM_NOTFOUND )
-            {
-//                pMenu->EnableItem( nId, FALSE );
-                pMenu->SetPopupMenu( nId, 0 );
-            }
-        }
-
-        if ( pOldPopup )
-        {
-            // no new popup menu created, so reset pointer before deleting menu
-            if ( pOldPopup == aObjMenus[n].pPMMgr )
-                aObjMenus[n].pPMMgr = NULL;
-            pOldPopup->StoreConfig();
-            delete pOldPopup;
-        }
-
-        if ( bDowning )
-        {
-            // delete possible empty popup menues
-            PopupMenu *pPop = pMenu->GetPopupMenu( nId );
-            if ( pPop )
-            {
-                pMenu->SetPopupMenu( nId, 0 );
-                delete pPop;
-            }
-        }
-        else if ( bInMenu )
-        {
-            // insert an empty popup window
-            if ( !aObjMenus[n].pPMMgr && !pMenu->GetPopupMenu( nId ) )
-                pMenu->SetPopupMenu( nId, new PopupMenu );
-        }
-    }
-}
-
-//------------------------------------------------------------------------
-
-void SfxMenuBarManager::ReconfigureObjectMenus()
-{
-    for ( int n = 0; n < 4; ++n )
-    {
-        if ( aObjMenus[n].nId )
-        {
-            Menu *pMenu = GetMenu()->GetSVMenu();
-            if ( pMenu->GetItemPos( n + SID_OBJECTMENU0 ) != MENU_ITEM_NOTFOUND )
-            {
-                if ( !aObjMenus[n].pPMMgr )
-                {
-                    ResId aResId(aObjMenus[n].nId, aObjMenus[n].pResMgr);
-                    aObjMenus[n].pPMMgr =
-                        new SfxPopupMenuManager( aResId , GetBindings() );
-                    aObjMenus[n].pPMMgr->Initialize();
-                }
-
-                pMenu->SetPopupMenu( n + SID_OBJECTMENU0,
-                    (PopupMenu*) aObjMenus[n].pPMMgr->GetMenu()->GetSVMenu() );
-                pMenu->EnableItem( n + SID_OBJECTMENU0, TRUE );
-            }
-        }
-    }
-}
-//====================================================================
-*/
 // don't insert Popups into ConfigManager, they are not configurable at the moment !
 SfxPopupMenuManager::SfxPopupMenuManager(const ResId& rResId, SfxBindings &rBindings )
     : SfxMenuManager( rResId, rBindings )
@@ -1426,63 +396,9 @@ void SfxPopupMenuManager::CheckItem( USHORT nId, BOOL bCheck )
 
 void SfxPopupMenuManager::AddClipboardFunctions()
 {
-    /*
-    if ( bMenuBar )
-    {
-        DBG_ERROR( "Not for menubars!" );
-        return;
-    } */
-
     bAddClipboardFuncs = TRUE;
 }
-/*
-int SfxMenuManager::Load( SotStorage& rStorage )
-{
-    SotStorageStreamRef xStream = rStorage.OpenSotStream( SfxMenuManager::GetStreamName(), STREAM_STD_READ );
-    if ( xStream->GetError() )
-        return SfxConfigItem::ERR_READ;
-    else
-        return Load( *xStream );
-}
-
-BOOL SfxMenuManager::Store( SotStorage& rStorage )
-{
-    SotStorageStreamRef xStream = rStorage.OpenSotStream( SfxMenuManager::GetStreamName(), STREAM_STD_READWRITE|STREAM_TRUNC );
-    if ( xStream->GetError() )
-        return FALSE;
-    else
-        return Store( *xStream );
-}
-
-int SfxMenuBarManager::Load( SotStorage& rStorage )
-{
-    SotStorageStreamRef xStream = rStorage.OpenSotStream( SfxMenuManager::GetStreamName(), STREAM_STD_READ );
-    if ( xStream->GetError() )
-        return SfxConfigItem::ERR_READ;
-    else
-    {
-        Menu *pSVMenu = LoadMenuBar( *xStream );
-        if ( pSVMenu )
-        {
-            Construct_Impl( pSVMenu, FALSE );
-            SetDefault( FALSE );
-            return ERR_OK;
-        }
-        else
-            UseDefault();
-        return ERR_READ;
-    }
-}
 
-BOOL SfxMenuBarManager::Store( SotStorage& rStorage )
-{
-    SotStorageStreamRef xStream = rStorage.OpenSotStream( SfxMenuManager::GetStreamName(), STREAM_STD_READWRITE|STREAM_TRUNC );
-    if ( xStream->GetError() )
-        return FALSE;
-    else
-        return StoreMenuBar( *xStream, (MenuBar*) GetMenu()->GetSVMenu() );
-}
-*/
 SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings )
 :   pMenu(0),
     pOldMenu(0),
@@ -1544,11 +460,3 @@ void SfxPopupMenuManager::ExecutePopup( const ResId& rResId, SfxViewFrame* pFram
         aPop.Execute( rPoint, pWindow );
     }
 }
-/*
-BOOL SfxMenuBarManager::ReInitialize()
-{
-    BOOL bRet = SfxConfigItem::ReInitialize();
-    if ( bRet )
-        UpdateObjectMenus();
-    return bRet;
-} */