diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-13 13:27:46 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-13 13:48:23 +0100 |
| commit | 6e4d3bad807a32371fe49f0a4a28ca0e5b0f6e70 (patch) | |
| tree | 9e0f0f964884306b9675ce87e0c129cbcee5b963 /framework/inc | |
| parent | 4ea76db5e53235971b597a2810a6d12618d6aaea (diff) | |
Clean up integer types representing positions in ToolBox's item vector
(vs. uses of sal_uInt16 representing such items' IDs). APPEND and ITEM_NOTFOUND
are members of ToolBox now (and have been bumped to the corresponding type's
max). The payload of VclEventIds
ToolboxButtonStateChanged
ToolboxClick
ToolboxHighlightOff
ToolboxItemAdded
ToolboxItemDisabled
ToolboxItemEnabled
ToolboxItemRemoved
ToolboxItemTextChanged
ToolboxItemUpdated
ToolboxItemWindowChanged
ToolboxSelect
has been changed too (note that reading/writing of those payloads isn't very
consistent, though: for some of these, values are written that are never read,
while for some others no values are ever written but the reading code would like
to receive some value if the payload wasn't a nullptr).
Change-Id: I4856ffb3637404b8d866621a3503d7922b1b8141
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/uielement/toolbarmerger.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index 683af8635d5e..665f37b3e086 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -63,7 +63,7 @@ typedef ::std::vector< AddonToolbarItem > AddonToolbarItemContainer; struct ReferenceToolbarPathInfo { VclPtr<ToolBox> pToolbar; - sal_uInt16 nPos; + ToolBox::ImplToolItems::size_type nPos; bool bResult; }; @@ -88,7 +88,7 @@ class ToolBarMerger const OUString& rReferencePoint ); static bool ProcessMergeOperation( ToolBox* pToolbar, - sal_uInt16 nPos, + ToolBox::ImplToolItems::size_type nPos, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, const OUString& rModuleIdentifier, @@ -97,7 +97,7 @@ class ToolBarMerger const AddonToolbarItemContainer& rItems ); static bool ProcessMergeFallback( ToolBox* pToolbar, - sal_uInt16 nPos, + ToolBox::ImplToolItems::size_type nPos, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, const OUString& rModuleIdentifier, @@ -106,7 +106,7 @@ class ToolBarMerger const AddonToolbarItemContainer& rItems ); static bool MergeItems( ToolBox* pToolbar, - sal_uInt16 nPos, + ToolBox::ImplToolItems::size_type nPos, sal_uInt16 nModIndex, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, @@ -114,14 +114,14 @@ class ToolBarMerger const AddonToolbarItemContainer& rAddonToolbarItems ); static bool ReplaceItem( ToolBox* pToolbar, - sal_uInt16 nPos, + ToolBox::ImplToolItems::size_type nPos, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, const OUString& rModuleIdentifier, const AddonToolbarItemContainer& rAddonToolbarItems ); static bool RemoveItems( ToolBox* pToolbar, - sal_uInt16 nPos, + ToolBox::ImplToolItems::size_type nPos, const OUString& rMergeCommandParameter ); static ::cppu::OWeakObject* CreateController( @@ -134,7 +134,7 @@ class ToolBarMerger const OUString& rControlType ); static void CreateToolbarItem( ToolBox* pToolbox, - sal_uInt16 nPos, + ToolBox::ImplToolItems::size_type nPos, sal_uInt16 nItemId, const AddonToolbarItem& rAddonToolbarItem ); |