summaryrefslogtreecommitdiff
path: root/framework/source/uielement/menubarmanager.cxx
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2005-01-31 14:25:58 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2005-01-31 14:25:58 +0000
commit50bd6a087daf4cbdbbe591289c008b3398cf30c9 (patch)
tree2fe0e53c994c20219a3eb27a5fa9ebc7bf874978 /framework/source/uielement/menubarmanager.cxx
parentba818c0cf7d170264eef677e3a12f8abb9d1bab5 (diff)
INTEGRATION: CWS sdksample (1.17.2); FILE MERGED
2005/01/26 17:30:49 cd 1.17.2.1: #i29308# Detect tools menu with .uno: command
Diffstat (limited to 'framework/source/uielement/menubarmanager.cxx')
-rw-r--r--framework/source/uielement/menubarmanager.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 1112fe1609..62fdd7856b 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: menubarmanager.cxx,v $
*
- * $Revision: 1.19 $
+ * $Revision: 1.20 $
*
- * last change: $Author: rt $ $Date: 2005-01-28 17:20:16 $
+ * last change: $Author: rt $ $Date: 2005-01-31 15:25:58 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -280,6 +280,7 @@ const ::rtl::OUString aCmdNewDocDirect( RTL_CONSTASCII_USTRINGPARAM( ".uno:AddDi
const ::rtl::OUString aSlotAutoPilot( RTL_CONSTASCII_USTRINGPARAM( "slot:6381" ));
const ::rtl::OUString aCmdAutoPilot( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoPilotMenu" ));
const ::rtl::OUString aCmdHelpIndex( RTL_CONSTASCII_USTRINGPARAM( ".uno:HelpIndex" ));
+const ::rtl::OUString aCmdToolsMenu( RTL_CONSTASCII_USTRINGPARAM( ".uno:ToolsMenu" ));
const ::rtl::OUString aSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "file" ));
const ::rtl::OUString aSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "window" ));
@@ -1674,7 +1675,8 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, Reference< XFrame >& rFrame,
// Create addon popup menu if there exist elements and this is the tools popup menu
if (( nItemId == SID_ADDONLIST ||
- aItemCommand == aSlotSpecialToolsMenu ) &&
+ aItemCommand == aSlotSpecialToolsMenu ||
+ aItemCommand == aCmdToolsMenu ) &&
AddonMenuManager::HasAddonMenuElements() )
{
USHORT nCount = 0;