From b1426b5b502fd591402d666994e3f1fb3a8ad959 Mon Sep 17 00:00:00 2001 From: Tomaž Vajngerl Date: Sun, 30 Oct 2016 16:24:37 +0100 Subject: tdf#95014 initial support for 32 px icons in toolbar MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This adds support for 32 pixel icons - mainly to get them into the toolbar. Most changes made are to change the behavior of having only small and large icons as a boolean choice, but not every code path was converted to non-boolean choice yet. Breeze icon theme has the 32px variants so it can be used already. Change-Id: Iadf832a87826c16b3a83522104dd6c35d61a0f87 Reviewed-on: https://gerrit.libreoffice.org/30398 Reviewed-by: Tomaž Vajngerl Tested-by: Tomaž Vajngerl --- framework/inc/uielement/toolbarmanager.hxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'framework/inc') diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 4a60aff7559b..48722dec5acb 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -156,11 +156,12 @@ class ToolBarManager : public ToolbarManager_Base typedef std::unordered_map< sal_uInt16, css::uno::Reference< css::container::XIndexAccess > > MenuDescriptionMap; bool m_bDisposed : 1, - m_bSmallSymbols : 1, m_bAddedToTaskPaneList : 1, m_bFrameActionRegistered : 1, m_bUpdateControllers : 1; + sal_Int16 m_eSymbolSize; + VclPtr m_pToolBar; OUString m_aModuleIdentifier; -- cgit