diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-04 16:16:19 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-04 16:16:19 +0000 |
| commit | 75b2f2c02a85614d066b019b90b2a124fad0fec3 (patch) | |
| tree | d9b81913e2b18fa95b54d06f3edd07fc8a21637d /framework | |
| parent | f12bd2305aaadb6a5ccb8249c80b7865e4613005 (diff) | |
INTEGRATION: CWS fwk01 (1.7.2.1.6); FILE MERGED
2003/03/19 13:11:01 cd 1.7.2.1.6.2: #107568# Support Add-On help menu items directly in the Office help menu
2003/03/07 09:29:09 cd 1.7.2.1.6.1: #107568# Support extended Add-Ons configuration format
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/dispatch/menudispatcher.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 7baa6f5ecdf8..e3201ce93abe 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -2,9 +2,9 @@ * * $RCSfile: menudispatcher.cxx,v $ * - * $Revision: 1.8 $ + * $Revision: 1.9 $ * - * last change: $Author: hr $ $Date: 2003-03-25 18:21:37 $ + * last change: $Author: hr $ $Date: 2003-04-04 17:16:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -173,7 +173,7 @@ using namespace ::vos ; // non exported const //_________________________________________________________________________________________________________________ -const USHORT SLOTID_HELPPOPUPMENU = 5410; +const USHORT SLOTID_MDIWINDOWLIST = 5610; //_________________________________________________________________________________________________________________ // non exported definitions @@ -574,7 +574,7 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR { OGuard aSolarGuard( Application::GetSolarMutex() ); { - USHORT nPos = pMenuBar->GetItemPos( SLOTID_HELPPOPUPMENU ); + USHORT nPos = pMenuBar->GetItemPos( SLOTID_MDIWINDOWLIST ); if ( nPos != MENU_ITEM_NOTFOUND ) { OUString aNoContext; @@ -586,7 +586,10 @@ sal_Bool MenuDispatcher::impl_setMenuBar( MenuBar* pMenuBar, sal_Bool bMenuFromR xModel = Reference< XModel >( xController->getModel(), UNO_QUERY ); // retrieve addon popup menus and add them to our menu bar - AddonPopupMenu::MergeAddonPopupMenus( xFrame, xModel, nPos, pMenuBar ); + AddonMenuManager::MergeAddonPopupMenus( xFrame, xModel, nPos, pMenuBar ); + + // retrieve addon help menu items and add them to our help menu + AddonMenuManager::MergeAddonHelpMenu( xFrame, pMenuBar ); } // set new menu on our system window and create new menu manager |