diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-02-07 12:15:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-02-07 12:35:59 +0100 |
| commit | 98eef2182dc5ed70709c714e7466774f254606ef (patch) | |
| tree | 805fd6921898b3698c9658a8c02fc9b2467440e7 /framework/inc/uielement/menubarmerger.hxx | |
| parent | c1894cedc5167e88507b1ea498c89817b7d0cb50 (diff) | |
loplugin:deletedspecial
Change-Id: I8de9f20ba2d19631da111f11cfe85225039e30f6
Diffstat (limited to 'framework/inc/uielement/menubarmerger.hxx')
| -rw-r--r-- | framework/inc/uielement/menubarmerger.hxx | 36 |
1 files changed, 15 insertions, 21 deletions
diff --git a/framework/inc/uielement/menubarmerger.hxx b/framework/inc/uielement/menubarmerger.hxx index e658d902a7d4..c42d48eecbca 100644 --- a/framework/inc/uielement/menubarmerger.hxx +++ b/framework/inc/uielement/menubarmerger.hxx @@ -57,59 +57,53 @@ struct ReferencePathInfo RPResultInfo eResult; }; -class MenuBarMerger +namespace MenuBarMerger { - public: - static bool IsCorrectContext( const OUString& aContext, const OUString& aModuleIdentifier ); + bool IsCorrectContext( const OUString& aContext, const OUString& aModuleIdentifier ); - static void RetrieveReferencePath( const OUString&, + void RetrieveReferencePath( const OUString&, std::vector< OUString >& aReferencePath ); - static ReferencePathInfo FindReferencePath( const std::vector< OUString >& aReferencePath, Menu* pMenu ); - static sal_uInt16 FindMenuItem( const OUString& rCmd, + ReferencePathInfo FindReferencePath( const std::vector< OUString >& aReferencePath, Menu* pMenu ); + sal_uInt16 FindMenuItem( const OUString& rCmd, Menu* pMenu ); - static void GetMenuEntry( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rAddonMenuEntry, + void GetMenuEntry( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rAddonMenuEntry, AddonMenuItem& aAddonMenu ); - static void GetSubMenu( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rSubMenuEntries, + void GetSubMenu( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& rSubMenuEntries, AddonMenuContainer& rSubMenu ); - static bool ProcessMergeOperation( Menu* pMenu, + bool ProcessMergeOperation( Menu* pMenu, sal_uInt16 nPos, sal_uInt16& rItemId, const OUString& rMergeCommand, const OUString& rMergeCommandParameter, const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ); - static bool ProcessFallbackOperation( const ReferencePathInfo& aRefPathInfo, + bool ProcessFallbackOperation( const ReferencePathInfo& aRefPathInfo, sal_uInt16& rItemId, const OUString& rMergeCommand, const OUString& rMergeFallback, const ::std::vector< OUString >& rReferencePath, const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ); - static bool ProcessFallbackOperation(); - static bool MergeMenuItems( Menu* pMenu, + bool ProcessFallbackOperation(); + bool MergeMenuItems( Menu* pMenu, sal_uInt16 nPos, sal_uInt16 nModIndex, sal_uInt16& rItemId, const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ); - static bool ReplaceMenuItem( Menu* pMenu, + bool ReplaceMenuItem( Menu* pMenu, sal_uInt16 nPos, sal_uInt16& rItemId, const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonMenuItems ); - static bool RemoveMenuItems( Menu* pMenu, + bool RemoveMenuItems( Menu* pMenu, sal_uInt16 nPos, const OUString& rMergeCommandParameter ); - static bool CreateSubMenu( Menu* pSubMenu, + bool CreateSubMenu( Menu* pSubMenu, sal_uInt16& nItemId, const OUString& rModuleIdentifier, const AddonMenuContainer& rAddonSubMenu ); - - private: - MenuBarMerger(); - MenuBarMerger( const MenuBarMerger& ); - MenuBarMerger& operator=( const MenuBarMerger& ); -}; +} } // namespace framework |