diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-02-15 01:39:02 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-02-15 00:19:45 +0000 |
| commit | cdf4b2bba8d694299c784f46fe3ecef2ce41171e (patch) | |
| tree | e5f03def77b83750255865aeb44d4262f4946665 /include/sfx2 | |
| parent | 3fac6aa16eb4b3e19100725f9fc2350cfe9ecee8 (diff) | |
Related: tdf#105672 Load toolbar properties from .ui
- Supports toolbar-style, icon-size, orientation.
- Defaults are:
toolbar-style = icons only
icon-size = what's set in Tools > Options... for Sidebar/Notebookbar
orientation = horizontal
- Remove no longer needed BigToolBox (use toolbar-style=both + icon-size=3 instead).
Change-Id: I185388255a351dfd6719a363b7e399bf36b0b25d
Reviewed-on: https://gerrit.libreoffice.org/34281
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
Diffstat (limited to 'include/sfx2')
| -rw-r--r-- | include/sfx2/sidebar/SidebarToolBox.hxx | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/sfx2/sidebar/SidebarToolBox.hxx b/include/sfx2/sidebar/SidebarToolBox.hxx index 19d923d34a49..793d2a7056ab 100644 --- a/include/sfx2/sidebar/SidebarToolBox.hxx +++ b/include/sfx2/sidebar/SidebarToolBox.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SFX2_SIDEBAR_SIDEBARTOOLBOX_HXX #include <sfx2/dllapi.h> -#include <sfx2/sidebar/SidebarToolBox.hxx> #include <vcl/toolbox.hxx> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -28,7 +27,6 @@ #include <com/sun/star/util/URL.hpp> #include <map> - namespace sfx2 { namespace sidebar { /** The sidebar tool box has two responsibilities: @@ -43,7 +41,7 @@ public: virtual ~SidebarToolBox() override; virtual void dispose() override; - virtual ToolBoxButtonSize GetIconSize() const; + virtual ToolBoxButtonSize GetDefaultButtonSize() const; using ToolBox::InsertItem; virtual void InsertItem(const OUString& rCommand, @@ -59,10 +57,13 @@ public: css::uno::Reference<css::frame::XToolbarController> GetFirstController(); + void InitToolBox(VclBuilder::stringmap& rMap); + protected: typedef std::map<sal_uInt16, css::uno::Reference<css::frame::XToolbarController>> ControllerContainer; ControllerContainer maControllers; bool mbAreHandlersRegistered; + bool mbUseDefaultButtonSize; DECL_LINK(DropDownClickHandler, ToolBox*, void); DECL_LINK(ClickHandler, ToolBox*, void); |