diff options
| author | Carsten Driesner <cd@openoffice.org> | 2011-01-10 11:36:55 +0100 |
|---|---|---|
| committer | Carsten Driesner <cd@openoffice.org> | 2011-01-10 11:36:55 +0100 |
| commit | ae8f575a3d9f0918b72991688d114a281950ac19 (patch) | |
| tree | e853b8f98cce5fe4d469b01ee7d014f7a7d65745 /framework/inc | |
| parent | 9e2d73aef6b5c15794936a849ead050ca3d205e3 (diff) | |
removetooltypes01: #i112600# Removed tools types from framework
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/framework/addonmenu.hxx | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/framework/inc/framework/addonmenu.hxx b/framework/inc/framework/addonmenu.hxx index 27b97d70d822..da3c9bb8740b 100644 --- a/framework/inc/framework/addonmenu.hxx +++ b/framework/inc/framework/addonmenu.hxx @@ -115,25 +115,14 @@ class FWE_DLLPUBLIC AddonMenuManager MenuBar* pMergeMenuBar ); // Returns the next position to insert a menu item/sub menu -<<<<<<< local static sal_uInt16 GetNextPos( sal_uInt16 nPos ); -======= - static USHORT GetNextPos( USHORT nPos ); - ->>>>>>> other // Build up the menu item and sub menu into the provided pCurrentMenu. The sub menus should be of type nSubMenuType. static void BuildMenu( PopupMenu* pCurrentMenu, MenuType nSubMenuType, -<<<<<<< local sal_uInt16 nInsPos, sal_uInt16& nUniqueMenuId, com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition, -======= - USHORT nInsPos, - USHORT& nUniqueMenuId, - com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > aAddonMenuDefinition, ->>>>>>> other const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel ); |