diff options
Diffstat (limited to 'framework/inc/uielement/toolbarmerger.hxx')
| -rw-r--r-- | framework/inc/uielement/toolbarmerger.hxx | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index 4ad1467bbe64..683af8635d5e 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -87,8 +87,7 @@ class ToolBarMerger static ReferenceToolbarPathInfo FindReferencePoint( ToolBox* pToolbar, const OUString& rReferencePoint ); - static bool ProcessMergeOperation( const css::uno::Reference< css::frame::XFrame >& xFrame, - ToolBox* pToolbar, + static bool ProcessMergeOperation( ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, @@ -97,8 +96,7 @@ class ToolBarMerger const OUString& rMergeCommandParameter, const AddonToolbarItemContainer& rItems ); - static bool ProcessMergeFallback( const css::uno::Reference< css::frame::XFrame >& xFrame, - ToolBox* pToolbar, + static bool ProcessMergeFallback( ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, @@ -107,8 +105,7 @@ class ToolBarMerger const OUString& rMergeFallback, const AddonToolbarItemContainer& rItems ); - static bool MergeItems( const css::uno::Reference< css::frame::XFrame >& xFrame, - ToolBox* pToolbar, + static bool MergeItems( ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16 nModIndex, sal_uInt16& rItemId, @@ -116,8 +113,7 @@ class ToolBarMerger const OUString& rModuleIdentifier, const AddonToolbarItemContainer& rAddonToolbarItems ); - static bool ReplaceItem( const css::uno::Reference< css::frame::XFrame >& xFrame, - ToolBox* pToolbar, + static bool ReplaceItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, |