diff options
| author | Noel Grandin <noel@peralex.com> | 2016-09-02 13:54:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-09-05 08:21:46 +0200 |
| commit | a1cd62bcd589a7c1050e327f4cb0ad95f9ea19d1 (patch) | |
| tree | 4564ea2be6311b5e44e67d9036bafab0c501ccb8 /include | |
| parent | 256654c26fa0d474891809d30d0004c3d87a5841 (diff) | |
convert ToolBoxButtonSize to scoped enum
Change-Id: I365b0e34361eb339b04e5f4792f54eff5bf582a5
Diffstat (limited to 'include')
| -rw-r--r-- | include/sfx2/sidebar/SidebarToolBox.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/miscopt.hxx | 9 | ||||
| -rw-r--r-- | include/vcl/toolbox.hxx | 2 |
3 files changed, 7 insertions, 6 deletions
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index d61f15f15a2b..3eb7eb49efe2 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -43,7 +43,7 @@ public: virtual ~SidebarToolBox(); virtual void dispose() override; - virtual sal_uInt16 GetIconSize() const; + virtual ToolBoxButtonSize GetIconSize() const; using ToolBox::InsertItem; virtual void InsertItem(const OUString& rCommand, diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx index 5d6a91a90ad7..aa926907ef1f 100644 --- a/include/svtools/miscopt.hxx +++ b/include/svtools/miscopt.hxx @@ -35,6 +35,7 @@ *//*-*************************************************************************************************************/ class SvtMiscOptions_Impl; +enum class ToolBoxButtonSize; /*-************************************************************************************************************ @short collect information about misc group @@ -62,10 +63,10 @@ class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options sal_Int16 GetSymbolsSize() const; void SetSymbolsSize( sal_Int16 eSet ); - sal_Int16 GetSidebarIconSize() const; - void SetSidebarIconSize( sal_Int16 eSet ); - sal_Int16 GetNotebookbarIconSize() const; - void SetNotebookbarIconSize( sal_Int16 eSet ); + ToolBoxButtonSize GetSidebarIconSize() const; + void SetSidebarIconSize( ToolBoxButtonSize eSet ); + ToolBoxButtonSize GetNotebookbarIconSize() const; + void SetNotebookbarIconSize( ToolBoxButtonSize eSet ); sal_Int16 GetCurrentSymbolsSize() const; bool AreCurrentSymbolsLarge() const; diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 6020b01a8257..28a70451217d 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -60,7 +60,7 @@ namespace o3tl // small or large force an exact toolbox size for proper alignemnt // dontcare will let the toolbox decide about its size -enum ToolBoxButtonSize { TOOLBOX_BUTTONSIZE_DONTCARE, TOOLBOX_BUTTONSIZE_SMALL, TOOLBOX_BUTTONSIZE_LARGE }; +enum class ToolBoxButtonSize { DontCare, Small, Large }; // ToolBoxLayoutMode::Normal - traditional layout, items are centered in the toolbar // ToolBoxLayoutMode::LockVert - special mode (currently used for calc input/formula |