diff options
| author | Antonio Fernandez <antonio.fernandez@aentos.es> | 2012-08-13 20:21:11 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2012-11-14 13:52:41 +0100 |
| commit | 2b91cea7a2887d53a742c2f52dbcebd79fc0bd3c (patch) | |
| tree | 0fb00209efadf76e34f8a27b55d008b74a2cb77a /framework | |
| parent | f847064bd9b82ab4feb9d914679fcec9fce3231c (diff) | |
Menu is displayed correctly in additional instancesm but not in the main one.
Change-Id: Id7d79e47efd73ddc2eeac285c28179a5aa9ecc37
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uielement/menubarmanager.hxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 23 |
2 files changed, 0 insertions, 25 deletions
diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 10ca227885a6..07f352bf3bad 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -170,8 +170,6 @@ class MenuBarManager : public com::sun::star::frame::XStatusListener void SetItemContainer( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& rItemContainer ); void GetPopupController( PopupControllerCache& rPopupController ); - void GenerateFullMenuHierarchy( AbstractMenu* pMenu ); - protected: DECL_LINK(Highlight, void *); DECL_LINK( Activate, AbstractMenu * ); diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 33912f35862e..4087c8c3e0fd 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -2126,29 +2126,6 @@ void MenuBarManager::SetHdl() ::comphelper::getComponentContext(mxServiceFactory)) ); } -void MenuBarManager::GenerateFullMenuHierarchy( AbstractMenu* pMenu ) -{ - if (pMenu) { - for (int i=0; i < pMenu->GetItemCount(); i++) - { - sal_Int16 nId = pMenu->GetItemId( i ); - -// this->Activate( pMenu->GetPopupMenu( nId ) ); -// this->Activate(pMenu); -// this->Deactivate(pMenu); - - String aCommandLabel = pMenu->GetItemCommand( nId ); - ::rtl::OUString aCommand( aCommandLabel ); - - String label = RetrieveLabelFromCommand( aCommandLabel ); - pMenu->SetItemText( nId, label ); - - AddMenu( this, aCommand, nId ); - GenerateFullMenuHierarchy( pMenu->GetPopupMenu( nId ) ); - } - } -} - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |