strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS fwk23 (1.3.124); FILE MERGED

Browse source 
2005/10/17 10:02:00 abi 1.3.124.2: RESYNC: (1.3-1.4); FILE MERGED
2005/08/19 15:11:31 cd 1.3.124.1: #124671# Controller must use image id from bookmark menu factory to retrieve the correct image
This commit is contained in:
Kurt Zenker 2005-11-03 11:00:39 +00:00
parent 0d7146315a
commit 3dac7dd237
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
framework/inc/uielement/newmenucontroller.hxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: newmenucontroller.hxx,v $ * $RCSfile: newmenucontroller.hxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: rt $ $Date: 2005-09-09 00:45:26 $ * last change: $Author: kz $ $Date: 2005-11-03 12:00:39 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -149,7 +149,13 @@ namespace framework
DECL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument* ); DECL_STATIC_LINK( NewMenuController, ExecuteHdl_Impl, NewDocument* );
private: private:
typedef ::std::hash_map< int, ::rtl::OUString > TargetFrameForId; struct AddInfo
{
rtl::OUString aTargetFrame;
rtl::OUString aImageId;
};
typedef ::std::hash_map< int, AddInfo > AddInfoForId;
void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); void fillPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu );
void retrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg, void retrieveShortcutsFromConfiguration( const ::com::sun::star::uno::Reference< ::com::sun::star::ui::XAcceleratorConfiguration >& rAccelCfg,
@ -157,6 +163,7 @@ namespace framework
std::vector< KeyCode >& aMenuShortCuts ); std::vector< KeyCode >& aMenuShortCuts );
void setAccelerators( PopupMenu* pPopupMenu ); void setAccelerators( PopupMenu* pPopupMenu );
void determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const KeyCode& rKeyCode ); void determineAndSetNewDocAccel( PopupMenu* pPopupMenu, const KeyCode& rKeyCode );
void setMenuImages( PopupMenu* pPopupMenu, sal_Bool bSetImages, sal_Bool bHiContrast );
private: private:
// members // members
@ -165,7 +172,7 @@ namespace framework
m_bNewMenu : 1, m_bNewMenu : 1,
m_bModuleIdentified : 1, m_bModuleIdentified : 1,
m_bAcceleratorCfg : 1; m_bAcceleratorCfg : 1;
TargetFrameForId m_aTargetFrameForItem; AddInfoForId m_aAddInfoForItem;
rtl::OUString m_aTargetFrame; rtl::OUString m_aTargetFrame;
rtl::OUString m_aModuleIdentifier; rtl::OUString m_aModuleIdentifier;
rtl::OUString m_aEmptyDocURL; rtl::OUString m_aEmptyDocURL;