summaryrefslogtreecommitdiff
path: root/vcl/inc
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/inc')
-rw-r--r--vcl/inc/salvtables.hxx4
-rw-r--r--vcl/inc/toolbox.h12
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index 1a0563307e0d..340c546f6f40 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1175,8 +1175,8 @@ class SalInstanceToolbar : public SalInstanceWidget, public virtual weld::Toolba
{
private:
VclPtr<ToolBox> m_xToolBox;
- std::map<sal_uInt16, VclPtr<vcl::Window>> m_aFloats;
- std::map<sal_uInt16, VclPtr<PopupMenu>> m_aMenus;
+ std::map<ToolBoxItemId, VclPtr<vcl::Window>> m_aFloats;
+ std::map<ToolBoxItemId, VclPtr<PopupMenu>> m_aMenus;
OString m_sStartShowIdent;
diff --git a/vcl/inc/toolbox.h b/vcl/inc/toolbox.h
index 8aa6bb915fcb..8e00f48f4772 100644
--- a/vcl/inc/toolbox.h
+++ b/vcl/inc/toolbox.h
@@ -58,7 +58,7 @@ struct ImplToolItem
ToolBoxItemType meType;
ToolBoxItemBits mnBits;
TriState meState;
- sal_uInt16 mnId;
+ ToolBoxItemId mnId;
bool mbEnabled:1,
mbVisible:1,
mbEmptyBtn:1,
@@ -68,11 +68,11 @@ struct ImplToolItem
mbExpand:1;
ImplToolItem();
- ImplToolItem( sal_uInt16 nItemId, const Image& rImage,
+ ImplToolItem( ToolBoxItemId nItemId, const Image& rImage,
ToolBoxItemBits nItemBits );
- ImplToolItem( sal_uInt16 nItemId, const OUString& rTxt,
+ ImplToolItem( ToolBoxItemId nItemId, const OUString& rTxt,
ToolBoxItemBits nItemBits );
- ImplToolItem( sal_uInt16 nItemId, const Image& rImage,
+ ImplToolItem( ToolBoxItemId nItemId, const Image& rImage,
const OUString& rTxt,
ToolBoxItemBits nItemBits );
@@ -97,7 +97,7 @@ struct ImplToolItem
bool IsItemHidden() const;
private:
- void init(sal_uInt16 nItemId, ToolBoxItemBits nItemBits, bool bEmptyBtn);
+ void init(ToolBoxItemId nItemId, ToolBoxItemBits nItemBits, bool bEmptyBtn);
};
namespace vcl
@@ -105,7 +105,7 @@ namespace vcl
struct ToolBoxLayoutData : public ControlLayoutData
{
- std::vector< sal_uInt16 > m_aLineItemIds;
+ std::vector< ToolBoxItemId > m_aLineItemIds;
};
} /* namespace vcl */