diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
| commit | 83d7b776fba6a9b6be8e52f221b237b49ff7612d (patch) | |
| tree | 204f94243b92698fa07d3859d7336a3730f626fd /framework/source/uielement/macrosmenucontroller.cxx | |
| parent | e02ccd1ae444b8bd21e963adc9f368c462fc3609 (diff) | |
| parent | da622616ce54d5c5b4e2e299fbf0a8ae527fd413 (diff) | |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'framework/source/uielement/macrosmenucontroller.cxx')
| -rw-r--r-- | framework/source/uielement/macrosmenucontroller.cxx | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 679067cbd5c3..e94d8f770fa8 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -48,6 +48,7 @@ #include <rtl/ustrbuf.hxx> #include <dispatch/uieventloghelper.hxx> #include "helper/mischelper.hxx" +#include "helpid.hrc" #include <vos/mutex.hxx> using namespace com::sun::star::uno; @@ -101,8 +102,6 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo String aDisplayName = RetrieveLabelFromCommand( aCommand ); pPopupMenu->InsertItem( 2, aDisplayName ); pPopupMenu->SetItemCommand( 2, aCommand ); - //pPopupMenu->SetHelpId( 2, HID_SVX_BASIC_MACRO_ORGANIZER ); - pPopupMenu->SetHelpId( 2, 40012 ); // insert providers but not basic or java addScriptItems( pPopupMenu, 4); @@ -222,8 +221,6 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt aDisplayName.Append( ellipsis ); pPopupMenu->InsertItem( itemId, aDisplayName ); pPopupMenu->SetItemCommand( itemId, aCommand ); - //pPopupMenu->SetHelpId( itemId, HID_SVX_COMMON_MACRO_ORGANIZER ); - pPopupMenu->SetHelpId( itemId, 40014 ); itemId++; break; } |