summaryrefslogtreecommitdiff
path: root/sfx2/inc/sidebar
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/inc/sidebar')
-rw-r--r--sfx2/inc/sidebar/ControllerFactory.hxx3
-rw-r--r--sfx2/inc/sidebar/SidebarToolBox.hxx6
2 files changed, 5 insertions, 4 deletions
diff --git a/sfx2/inc/sidebar/ControllerFactory.hxx b/sfx2/inc/sidebar/ControllerFactory.hxx
index d33f00d2e8b6..10ddf97c9df5 100644
--- a/sfx2/inc/sidebar/ControllerFactory.hxx
+++ b/sfx2/inc/sidebar/ControllerFactory.hxx
@@ -20,6 +20,7 @@
#include <sfx2/dllapi.h>
#include <com/sun/star/uno/Reference.hxx>
+#include <vcl/toolbox.hxx>
namespace com::sun::star::awt { class XWindow; }
namespace com::sun::star::frame { class XController; }
@@ -42,7 +43,7 @@ class ControllerFactory
public:
static css::uno::Reference<css::frame::XToolbarController> CreateToolBoxController(
ToolBox* pToolBox,
- const sal_uInt16 nItemId,
+ const ToolBoxItemId nItemId,
const OUString& rsCommandName,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
const css::uno::Reference<css::frame::XController>& rxController,
diff --git a/sfx2/inc/sidebar/SidebarToolBox.hxx b/sfx2/inc/sidebar/SidebarToolBox.hxx
index 93cd0a9795dc..1dd26503b0fa 100644
--- a/sfx2/inc/sidebar/SidebarToolBox.hxx
+++ b/sfx2/inc/sidebar/SidebarToolBox.hxx
@@ -56,7 +56,7 @@ public:
void InitToolBox(VclBuilder::stringmap& rMap);
protected:
- typedef std::map<sal_uInt16, css::uno::Reference<css::frame::XToolbarController>> ControllerContainer;
+ typedef std::map<ToolBoxItemId, css::uno::Reference<css::frame::XToolbarController>> ControllerContainer;
ControllerContainer maControllers;
bool mbAreHandlersRegistered;
bool mbUseDefaultButtonSize;
@@ -68,9 +68,9 @@ protected:
DECL_LINK(SelectHandler, ToolBox*, void);
DECL_LINK(ChangedIconSizeHandler, LinkParamNone*, void );
- css::uno::Reference<css::frame::XToolbarController> GetControllerForItemId(const sal_uInt16 nItemId) const;
+ css::uno::Reference<css::frame::XToolbarController> GetControllerForItemId(const ToolBoxItemId nItemId) const;
- void CreateController(const sal_uInt16 nItemId,
+ void CreateController(const ToolBoxItemId nItemId,
const css::uno::Reference<css::frame::XFrame>& rxFrame,
const sal_Int32 nItemWidth, bool bSideBar);
void RegisterHandlers();