diff options
| author | Tsutomu Uchino <hanya@apache.org> | 2014-05-16 12:48:54 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-05-19 13:28:17 +0100 |
| commit | 61ce018658cb673debae3d29a747252f6bc692ff (patch) | |
| tree | 5919c957bcee23f5971a5f358aeae869e36f6d00 /include | |
| parent | 39669d3244e3859471e665cf6afc754b6aca634e (diff) | |
Resolves: #i86528# use the module manager to identify the context...
for addons menu merging
(cherry picked from commit 2aac0070dbef6c1ad7eeccf7d4015cdcbffe067e)
Conflicts:
framework/source/classes/menumanager.cxx
framework/source/fwe/classes/addonmenu.cxx
framework/source/uielement/menubarmanager.cxx
include/framework/addonmenu.hxx
Change-Id: I3b606671db3a4c6ba8ed2b850e01e1ac91db7581
Diffstat (limited to 'include')
| -rw-r--r-- | include/framework/addonmenu.hxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx index d948cfe3472d..c53b140467c0 100644 --- a/include/framework/addonmenu.hxx +++ b/include/framework/addonmenu.hxx @@ -22,6 +22,8 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/menu.hxx> #include <framework/fwedllapi.h> @@ -80,23 +82,25 @@ class FWE_DLLPUBLIC AddonMenuManager static bool IsAddonMenuId( sal_uInt16 nId ) { return (( nId >= ADDONMENU_ITEMID_START ) && ( nId < ADDONMENU_ITEMID_END )); } // Check if the context string matches the provided xModel context - static bool IsCorrectContext( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& rModel, const OUString& aContext ); + static bool IsCorrectContext(const OUString& rModuleIdentifier, const OUString& rContext); // Factory method to create different Add-On menu types static PopupMenu* CreatePopupMenuType( MenuType eMenuType, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame ); // Create the Add-Ons menu - static AddonMenu* CreateAddonMenu( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame ); + static AddonMenu* CreateAddonMenu( const css::uno::Reference< css::frame::XFrame >& rFrame, + const css::uno::Reference< css::uno::XComponentContext >& rContext ); // Merge the Add-Ons help menu items into the given menu bar at a defined pos - static void MergeAddonHelpMenu( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - MenuBar* pMergeMenuBar ); + static void MergeAddonHelpMenu( const css::uno::Reference< css::frame::XFrame >& rFrame, + MenuBar* pMergeMenuBar, + const css::uno::Reference< css::uno::XComponentContext >& rContext ); // Merge the addon popup menus into the given menu bar at the provided pos. - static void MergeAddonPopupMenus( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel, + static void MergeAddonPopupMenus( const css::uno::Reference< css::frame::XFrame >& rFrame, sal_uInt16 nMergeAtPos, - MenuBar* pMergeMenuBar ); + MenuBar* pMergeMenuBar, + const css::uno::Reference< css::uno::XComponentContext >& rContext ); // Returns the next position to insert a menu item/sub menu static sal_uInt16 GetNextPos( sal_uInt16 nPos ); @@ -108,7 +112,7 @@ class FWE_DLLPUBLIC AddonMenuManager sal_uInt16& nUniqueMenuId, const com::sun::star::uno::Sequence< com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > >& aAddonMenuDefinition, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, - const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rModel ); + const ::rtl::OUString& rModuleIdentifier ); // Retrieve the menu entry property values from a sequence static void GetMenuEntry( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& rAddonMenuEntry, |