chart2/source/controller/inc/dlg_DataEditor.hxx | 1 chart2/source/controller/sidebar/ChartColorsPanel.hxx | 2 cui/source/inc/SpellDialog.hxx | 1 dbaccess/source/ui/inc/indexdialog.hxx | 1 fpicker/source/office/iodlgimp.hxx | 1 framework/inc/uielement/toolbarmanager.hxx | 1 include/avmedia/MediaControlBase.hxx | 1 include/framework/generictoolbarcontroller.hxx | 1 include/sfx2/devtools/ObjectInspectorWidgets.hxx | 1 include/sfx2/infobar.hxx | 1 include/sfx2/sidebar/TabBar.hxx | 1 include/svtools/toolboxcontroller.hxx | 7 - include/svx/bmpmask.hxx | 1 include/svx/dlgctrl.hxx | 1 include/svx/fillctrl.hxx | 1 include/svx/fontwork.hxx | 1 include/svx/imapdlg.hxx | 1 include/svx/sidebar/AreaPropertyPanelBase.hxx | 1 include/svx/sidebar/AreaTransparencyGradientPopup.hxx | 1 include/svx/sidebar/InspectorTextPanel.hxx | 1 include/svx/sidebar/LinePropertyPanelBase.hxx | 1 include/vcl/WeldedTabbedNotebookbar.hxx | 1 include/vcl/jsdialog/executor.hxx | 1 include/vcl/weld/Toolbar.hxx | 84 ++++++++++++++++++ include/vcl/weld/weld.hxx | 66 -------------- reportdesign/source/ui/dlg/Condition.hxx | 1 reportdesign/source/ui/inc/AddField.hxx | 1 reportdesign/source/ui/inc/GroupsSorting.hxx | 1 sc/source/ui/inc/navipi.hxx | 1 sc/source/ui/sidebar/AlignmentPropertyPanel.hxx | 1 sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx | 1 sc/source/ui/sidebar/CellBorderStyleControl.hxx | 1 sc/source/ui/sidebar/CellLineStyleControl.hxx | 1 sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 1 sfx2/inc/DevelopmentToolDockingWindow.hxx | 1 sfx2/inc/sidebar/TitleBar.hxx | 1 sfx2/source/appl/newhelp.hxx | 1 sfx2/source/inc/recfloat.hxx | 1 sfx2/source/inc/templdgi.hxx | 1 sfx2/source/toolbox/weldutils.cxx | 1 svtools/source/uno/toolboxcontroller.cxx | 1 svx/inc/tbxcolorupdate.hxx | 1 svx/source/dialog/contimp.hxx | 1 svx/source/inc/datanavi.hxx | 1 svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx | 1 svx/source/sidebar/lists/ListsPropertyPanel.hxx | 1 svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 1 svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 1 svx/source/sidebar/styles/StylesPropertyPanel.hxx | 1 svx/source/sidebar/text/TextPropertyPanel.hxx | 1 sw/source/uibase/inc/QuickFindPanel.hxx | 1 sw/source/uibase/inc/navipi.hxx | 2 sw/source/uibase/sidebar/TableEditPanel.hxx | 1 sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 1 vcl/inc/qt5/QtInstanceBuilder.hxx | 1 vcl/inc/qt5/QtInstanceToolbar.hxx | 2 vcl/inc/salvtables.hxx | 1 vcl/unx/gtk3/gtkinst.cxx | 1 58 files changed, 143 insertions(+), 72 deletions(-)
New commits: commit 3bbc98757ab6a62489899080926ed1559e2d8bd6 Author: Michael Weghorn <[email protected]> AuthorDate: Sat Jan 10 01:12:49 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Jan 10 23:19:56 2026 +0100 weld: Move weld::Toolbar to own header Move the class out of weld.hxx into its own header, in order to make it easier to keep an overview and to avoid having to recompile ~all UI code when the class is modified. Change-Id: Ie54aef229609f131d3d53874c9390339566880f3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196947 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index 3fadbc581997..184401231ed1 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -20,6 +20,7 @@ #pragma once #include <vcl/weld/DialogController.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weld.hxx> #include <rtl/ref.hxx> diff --git a/chart2/source/controller/sidebar/ChartColorsPanel.hxx b/chart2/source/controller/sidebar/ChartColorsPanel.hxx index ccaf5c0c642e..97c81e53de92 100644 --- a/chart2/source/controller/sidebar/ChartColorsPanel.hxx +++ b/chart2/source/controller/sidebar/ChartColorsPanel.hxx @@ -16,6 +16,8 @@ #include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <sfx2/sidebar/SidebarModelUpdate.hxx> #include <sfx2/sidebar/PanelLayout.hxx> +#include <vcl/weld/Toolbar.hxx> + #include "ChartSidebarModifyListener.hxx" #include "ChartSidebarSelectionListener.hxx" diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 6f99c7590d21..a496a83173c4 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -30,6 +30,7 @@ #include <editeng/SpellPortions.hxx> #include <vcl/weld/ComboBox.hxx> #include <vcl/weld/ScrolledWindow.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/customweld.hxx> diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index bedba211e888..2992ef559f17 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <vcl/weld/DialogController.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include "indexes.hxx" diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index b2a72d6814c2..901d563b4c43 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -22,6 +22,7 @@ #include <vcl/idle.hxx> #include <vcl/weld/ComboBox.hxx> +#include <vcl/weld/Toolbar.hxx> #include <deque> #include <memory> diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index b76949f5b4d2..218eb3bf6350 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -41,6 +41,7 @@ #include <tools/link.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weld.hxx> #include <vcl/window.hxx> #include <vcl/timer.hxx> diff --git a/include/avmedia/MediaControlBase.hxx b/include/avmedia/MediaControlBase.hxx index 07cccb4901a2..00769d78addc 100644 --- a/include/avmedia/MediaControlBase.hxx +++ b/include/avmedia/MediaControlBase.hxx @@ -21,6 +21,7 @@ #include <config_options.h> #include <vcl/weld/ComboBox.hxx> #include <vcl/weld/Entry.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weld.hxx> #include <avmedia/avmediadllapi.h> diff --git a/include/framework/generictoolbarcontroller.hxx b/include/framework/generictoolbarcontroller.hxx index 91a81cf096e6..70f831d28462 100644 --- a/include/framework/generictoolbarcontroller.hxx +++ b/include/framework/generictoolbarcontroller.hxx @@ -22,6 +22,7 @@ #include <framework/fwkdllapi.h> #include <svtools/toolboxcontroller.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Toolbar.hxx> namespace framework { diff --git a/include/sfx2/devtools/ObjectInspectorWidgets.hxx b/include/sfx2/devtools/ObjectInspectorWidgets.hxx index 68590acf3b4d..3126d8ca4ff8 100644 --- a/include/sfx2/devtools/ObjectInspectorWidgets.hxx +++ b/include/sfx2/devtools/ObjectInspectorWidgets.hxx @@ -14,6 +14,7 @@ #include <vcl/weld/Builder.hxx> #include <vcl/weld/Paned.hxx> #include <vcl/weld/TextView.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 5e8c0d4c3e1e..5647748d5487 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -17,6 +17,7 @@ #include <sfx2/dllapi.h> #include <vcl/InterimItemWindow.hxx> #include <vcl/weld/TextView.hxx> +#include <vcl/weld/Toolbar.hxx> // These must match the values in offapi/com/sun/star/frame/InfobarType.idl enum class InfobarType diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 4a81c171567c..fe0c45fe00fc 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -22,6 +22,7 @@ #include <vcl/InterimItemWindow.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/Toolbar.hxx> #include <com/sun/star/graphic/XGraphic.hpp> diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index c53aca7dc979..43ca44a40fee 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -36,6 +36,7 @@ #include <utility> #include <vcl/toolboxid.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/Toolbar.hxx> #include <unordered_map> @@ -47,12 +48,6 @@ namespace com :: sun :: star :: util { class XURLTransformer; } class ToolBox; -namespace weld -{ - class Builder; - class Toolbar; -} - namespace svt { diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index b9320ad902ec..9447aac07c74 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -31,6 +31,7 @@ #include <vcl/gdimtf.hxx> #include <vcl/graph.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> #include <memory> namespace vcl { class Window; } diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index ddc41490f86f..c761e198fae2 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -25,6 +25,7 @@ #include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/SpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <vcl/virdev.hxx> diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index 5e02bd7058e9..1718b02c909c 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -26,6 +26,7 @@ #include <sfx2/weldutils.hxx> #include <svx/svxdllapi.h> #include <vcl/weld/ComboBox.hxx> +#include <vcl/weld/Toolbar.hxx> class XFillStyleItem; class XFillColorItem; diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index 1780e3a313d6..5d019478d981 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -24,6 +24,7 @@ #include <svx/svxdllapi.h> #include <vcl/idle.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weld.hxx> class ColorListBox; diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 74abfd3616fc..330bb706aeff 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -25,6 +25,7 @@ #include <sfx2/basedlgs.hxx> #include <svx/svxdllapi.h> #include <vcl/weld/Entry.hxx> +#include <vcl/weld/Toolbar.hxx> #include <memory> #include <vector> diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index 42fdd95c5828..fb5ea3e4fa3b 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -36,6 +36,7 @@ #include <vcl/EnumContext.hxx> #include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> class ToolbarUnoDispatcher; class XFillFloatTransparenceItem; diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx index 3179a07a7243..570986d02180 100644 --- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx +++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx @@ -20,6 +20,7 @@ #include <basegfx/utils/bgradient.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weld.hxx> #include <svtools/toolbarmenu.hxx> diff --git a/include/svx/sidebar/InspectorTextPanel.hxx b/include/svx/sidebar/InspectorTextPanel.hxx index 7d47276efa19..de67685a80db 100644 --- a/include/svx/sidebar/InspectorTextPanel.hxx +++ b/include/svx/sidebar/InspectorTextPanel.hxx @@ -21,6 +21,7 @@ #include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/PanelLayout.hxx> #include <svx/svxdllapi.h> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> namespace svx::sidebar diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx index 0e9fa5e3072b..d17a24f78451 100644 --- a/include/svx/sidebar/LinePropertyPanelBase.hxx +++ b/include/svx/sidebar/LinePropertyPanelBase.hxx @@ -19,6 +19,7 @@ #pragma once #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weld.hxx> #include <memory> #include <svl/poolitem.hxx> diff --git a/include/vcl/WeldedTabbedNotebookbar.hxx b/include/vcl/WeldedTabbedNotebookbar.hxx index acbad1cd49a9..1f3448c7a219 100644 --- a/include/vcl/WeldedTabbedNotebookbar.hxx +++ b/include/vcl/WeldedTabbedNotebookbar.hxx @@ -14,6 +14,7 @@ #include <vcl/dllapi.h> #include <rtl/ustring.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weld.hxx> namespace com::sun::star::frame diff --git a/include/vcl/jsdialog/executor.hxx b/include/vcl/jsdialog/executor.hxx index 28c942e08960..053282dfa396 100644 --- a/include/vcl/jsdialog/executor.hxx +++ b/include/vcl/jsdialog/executor.hxx @@ -18,6 +18,7 @@ #include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/SpinButton.hxx> #include <vcl/weld/TextView.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <unordered_map> diff --git a/include/vcl/weld/Toolbar.hxx b/include/vcl/weld/Toolbar.hxx new file mode 100644 index 000000000000..b3614eb6b5a5 --- /dev/null +++ b/include/vcl/weld/Toolbar.hxx @@ -0,0 +1,84 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include <vcl/dllapi.h> +#include <vcl/weld/weld.hxx> + +namespace weld +{ +class VCL_DLLPUBLIC Toolbar : virtual public Widget +{ + Link<const OUString&, void> m_aClickHdl; + Link<const OUString&, void> m_aToggleMenuHdl; + +protected: + friend class ::LOKTrigger; + + void signal_clicked(const OUString& rIdent) { m_aClickHdl.Call(rIdent); } + void signal_toggle_menu(const OUString& rIdent) { m_aToggleMenuHdl.Call(rIdent); } + +public: + virtual void set_item_sensitive(const OUString& rIdent, bool bSensitive) = 0; + virtual bool get_item_sensitive(const OUString& rIdent) const = 0; + virtual void set_item_active(const OUString& rIdent, bool bActive) = 0; + virtual bool get_item_active(const OUString& rIdent) const = 0; + virtual void set_menu_item_active(const OUString& rIdent, bool bActive) = 0; + virtual bool get_menu_item_active(const OUString& rIdent) const = 0; + virtual void set_item_menu(const OUString& rIdent, weld::Menu* pMenu) = 0; + virtual void set_item_popover(const OUString& rIdent, weld::Widget* pPopover) = 0; + virtual void set_item_visible(const OUString& rIdent, bool bVisible) = 0; + virtual void set_item_help_id(const OUString& rIdent, const OUString& rHelpId) = 0; + virtual bool get_item_visible(const OUString& rIdent) const = 0; + virtual void set_item_label(const OUString& rIdent, const OUString& rLabel) = 0; + virtual OUString get_item_label(const OUString& rIdent) const = 0; + virtual void set_item_tooltip_text(const OUString& rIdent, const OUString& rTip) = 0; + virtual OUString get_item_tooltip_text(const OUString& rIdent) const = 0; + virtual void set_item_icon_name(const OUString& rIdent, const OUString& rIconName) = 0; + virtual void set_item_image_mirrored(const OUString& rIdent, bool bMirrored) = 0; + virtual void set_item_image(const OUString& rIdent, + const css::uno::Reference<css::graphic::XGraphic>& rIcon) + = 0; + virtual void set_item_image(const OUString& rIdent, VirtualDevice* pDevice) = 0; + + virtual void insert_item(int pos, const OUString& rId) = 0; + virtual void insert_separator(int pos, const OUString& rId) = 0; + void append_separator(const OUString& rId) { insert_separator(-1, rId); } + + virtual int get_n_items() const = 0; + virtual OUString get_item_ident(int nIndex) const = 0; + virtual void set_item_ident(int nIndex, const OUString& rIdent) = 0; + virtual void set_item_label(int nIndex, const OUString& rLabel) = 0; + virtual void set_item_image(int nIndex, + const css::uno::Reference<css::graphic::XGraphic>& rIcon) + = 0; + virtual void set_item_tooltip_text(int nIndex, const OUString& rTip) = 0; + virtual void set_item_accessible_name(int nIndex, const OUString& rName) = 0; + virtual void set_item_accessible_name(const OUString& rIdent, const OUString& rName) = 0; + + virtual vcl::ImageType get_icon_size() const = 0; + virtual void set_icon_size(vcl::ImageType eType) = 0; + + // return what modifiers are held + virtual sal_uInt16 get_modifier_state() const = 0; + + // This function returns the position a new item should be inserted if dnd + // is dropped at rPoint + virtual int get_drop_index(const Point& rPoint) const = 0; + + void connect_clicked(const Link<const OUString&, void>& rLink) { m_aClickHdl = rLink; } + void connect_menu_toggled(const Link<const OUString&, void>& rLink) + { + m_aToggleMenuHdl = rLink; + } +}; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/vcl/weld/weld.hxx b/include/vcl/weld/weld.hxx index addb210c9ac6..cdd4ad2ec799 100644 --- a/include/vcl/weld/weld.hxx +++ b/include/vcl/weld/weld.hxx @@ -1146,72 +1146,6 @@ public: void connect_closed(const Link<weld::Popover&, void>& rLink) { m_aCloseHdl = rLink; } }; -class VCL_DLLPUBLIC Toolbar : virtual public Widget -{ - Link<const OUString&, void> m_aClickHdl; - Link<const OUString&, void> m_aToggleMenuHdl; - -protected: - friend class ::LOKTrigger; - - void signal_clicked(const OUString& rIdent) { m_aClickHdl.Call(rIdent); } - void signal_toggle_menu(const OUString& rIdent) { m_aToggleMenuHdl.Call(rIdent); } - -public: - virtual void set_item_sensitive(const OUString& rIdent, bool bSensitive) = 0; - virtual bool get_item_sensitive(const OUString& rIdent) const = 0; - virtual void set_item_active(const OUString& rIdent, bool bActive) = 0; - virtual bool get_item_active(const OUString& rIdent) const = 0; - virtual void set_menu_item_active(const OUString& rIdent, bool bActive) = 0; - virtual bool get_menu_item_active(const OUString& rIdent) const = 0; - virtual void set_item_menu(const OUString& rIdent, weld::Menu* pMenu) = 0; - virtual void set_item_popover(const OUString& rIdent, weld::Widget* pPopover) = 0; - virtual void set_item_visible(const OUString& rIdent, bool bVisible) = 0; - virtual void set_item_help_id(const OUString& rIdent, const OUString& rHelpId) = 0; - virtual bool get_item_visible(const OUString& rIdent) const = 0; - virtual void set_item_label(const OUString& rIdent, const OUString& rLabel) = 0; - virtual OUString get_item_label(const OUString& rIdent) const = 0; - virtual void set_item_tooltip_text(const OUString& rIdent, const OUString& rTip) = 0; - virtual OUString get_item_tooltip_text(const OUString& rIdent) const = 0; - virtual void set_item_icon_name(const OUString& rIdent, const OUString& rIconName) = 0; - virtual void set_item_image_mirrored(const OUString& rIdent, bool bMirrored) = 0; - virtual void set_item_image(const OUString& rIdent, - const css::uno::Reference<css::graphic::XGraphic>& rIcon) - = 0; - virtual void set_item_image(const OUString& rIdent, VirtualDevice* pDevice) = 0; - - virtual void insert_item(int pos, const OUString& rId) = 0; - virtual void insert_separator(int pos, const OUString& rId) = 0; - void append_separator(const OUString& rId) { insert_separator(-1, rId); } - - virtual int get_n_items() const = 0; - virtual OUString get_item_ident(int nIndex) const = 0; - virtual void set_item_ident(int nIndex, const OUString& rIdent) = 0; - virtual void set_item_label(int nIndex, const OUString& rLabel) = 0; - virtual void set_item_image(int nIndex, - const css::uno::Reference<css::graphic::XGraphic>& rIcon) - = 0; - virtual void set_item_tooltip_text(int nIndex, const OUString& rTip) = 0; - virtual void set_item_accessible_name(int nIndex, const OUString& rName) = 0; - virtual void set_item_accessible_name(const OUString& rIdent, const OUString& rName) = 0; - - virtual vcl::ImageType get_icon_size() const = 0; - virtual void set_icon_size(vcl::ImageType eType) = 0; - - // return what modifiers are held - virtual sal_uInt16 get_modifier_state() const = 0; - - // This function returns the position a new item should be inserted if dnd - // is dropped at rPoint - virtual int get_drop_index(const Point& rPoint) const = 0; - - void connect_clicked(const Link<const OUString&, void>& rLink) { m_aClickHdl = rLink; } - void connect_menu_toggled(const Link<const OUString&, void>& rLink) - { - m_aToggleMenuHdl = rLink; - } -}; - class VCL_DLLPUBLIC Scrollbar : virtual public Widget { Link<Scrollbar&, void> m_aValueChangeHdl; diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 9a0f5beb8fb4..648635acc154 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -29,6 +29,7 @@ #include <vcl/weld/Builder.hxx> #include <vcl/weld/ComboBox.hxx> #include <vcl/weld/Entry.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> diff --git a/reportdesign/source/ui/inc/AddField.hxx b/reportdesign/source/ui/inc/AddField.hxx index 39ed78a79964..b379fa7304db 100644 --- a/reportdesign/source/ui/inc/AddField.hxx +++ b/reportdesign/source/ui/inc/AddField.hxx @@ -31,6 +31,7 @@ #include <cppuhelper/basemutex.hxx> #include <vcl/weld/DialogController.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/reportdesign/source/ui/inc/GroupsSorting.hxx b/reportdesign/source/ui/inc/GroupsSorting.hxx index 9c63f1340a56..2f4f91b77547 100644 --- a/reportdesign/source/ui/inc/GroupsSorting.hxx +++ b/reportdesign/source/ui/inc/GroupsSorting.hxx @@ -27,6 +27,7 @@ #include <rtl/ref.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/SpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weld.hxx> #include <osl/diagnose.h> diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx index 52b5d681bfd3..ef09e293f58a 100644 --- a/sc/source/ui/inc/navipi.hxx +++ b/sc/source/ui/inc/navipi.hxx @@ -28,6 +28,7 @@ #include <vcl/weld/Entry.hxx> #include <vcl/weld/SpinButton.hxx> #include <vcl/weld/TextView.hxx> +#include <vcl/weld/Toolbar.hxx> #include <rangeutl.hxx> #include "content.hxx" diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 5eedf7657b06..666c2fa82967 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -24,6 +24,7 @@ #include <sfx2/sidebar/PanelLayout.hxx> #include <vcl/EnumContext.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> namespace sc::sidebar { diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx index 8ee0212399e8..0c1a2ade6f09 100644 --- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx +++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx @@ -23,6 +23,7 @@ #include <sfx2/sidebar/PanelLayout.hxx> #include <vcl/EnumContext.hxx> #include <vcl/image.hxx> +#include <vcl/weld/Toolbar.hxx> #include <com/sun/star/frame/XFrame.hpp> class ToolbarUnoDispatcher; diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.hxx b/sc/source/ui/sidebar/CellBorderStyleControl.hxx index 1c66e623fb5c..d1420597a4ec 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.hxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.hxx @@ -20,6 +20,7 @@ #include <svtools/toolbarmenu.hxx> #include <svx/colorwindow.hxx> +#include <vcl/weld/Toolbar.hxx> class SfxDispatcher; diff --git a/sc/source/ui/sidebar/CellLineStyleControl.hxx b/sc/source/ui/sidebar/CellLineStyleControl.hxx index a9f6d7a59984..af70d0df9bc9 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.hxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.hxx @@ -22,6 +22,7 @@ #include <svx/colorwindow.hxx> #include <vcl/virdev.hxx> #include <vcl/vclptr.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> class SfxDispatcher; diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 44dee3339481..b9abfab7ed29 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -25,6 +25,7 @@ #include <vcl/EnumContext.hxx> #include <vcl/weld/ComboBox.hxx> #include <vcl/weld/SpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> namespace sc::sidebar { diff --git a/sfx2/inc/DevelopmentToolDockingWindow.hxx b/sfx2/inc/DevelopmentToolDockingWindow.hxx index 52e758ca50f5..6d3e1f358cce 100644 --- a/sfx2/inc/DevelopmentToolDockingWindow.hxx +++ b/sfx2/inc/DevelopmentToolDockingWindow.hxx @@ -12,6 +12,7 @@ #include <sfx2/dllapi.h> #include <sfx2/dockwin.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sfx2/inc/sidebar/TitleBar.hxx b/sfx2/inc/sidebar/TitleBar.hxx index 65463598a1bb..2517da7f3162 100644 --- a/sfx2/inc/sidebar/TitleBar.hxx +++ b/sfx2/inc/sidebar/TitleBar.hxx @@ -20,6 +20,7 @@ #include <sfx2/sidebar/Theme.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weld.hxx> namespace sfx2::sidebar { diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index d629305d0826..bb893e2d7456 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -32,6 +32,7 @@ #include <vcl/weld/DialogController.hxx> #include <vcl/weld/Entry.hxx> #include <vcl/weld/Paned.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <vcl/window.hxx> diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx index e5720e155cd6..cac6a3c9fb3a 100644 --- a/sfx2/source/inc/recfloat.hxx +++ b/sfx2/source/inc/recfloat.hxx @@ -23,6 +23,7 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/childwin.hxx> #include <sfx2/weldutils.hxx> +#include <vcl/weld/Toolbar.hxx> class SfxRecordingFloatWrapper_Impl final : public SfxChildWindow { diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 80a7dbb2cc5e..c76194ab092d 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -26,6 +26,7 @@ #include <vcl/transfer.hxx> #include <vcl/weld/Builder.hxx> #include <vcl/weld/ComboBox.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weld.hxx> #include <svl/eitem.hxx> diff --git a/sfx2/source/toolbox/weldutils.cxx b/sfx2/source/toolbox/weldutils.cxx index 7517e692c680..aa606f0115c9 100644 --- a/sfx2/source/toolbox/weldutils.cxx +++ b/sfx2/source/toolbox/weldutils.cxx @@ -13,6 +13,7 @@ #include <sfx2/weldutils.hxx> #include <vcl/commandinfoprovider.hxx> #include <vcl/settings.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weldutils.hxx> namespace diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx index 7c4d125f5b6c..b6e552c4f99d 100644 --- a/svtools/source/uno/toolboxcontroller.cxx +++ b/svtools/source/uno/toolboxcontroller.cxx @@ -31,6 +31,7 @@ #include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weldutils.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> diff --git a/svx/inc/tbxcolorupdate.hxx b/svx/inc/tbxcolorupdate.hxx index d14ba4bd1ec7..ff952b6c0c29 100644 --- a/svx/inc/tbxcolorupdate.hxx +++ b/svx/inc/tbxcolorupdate.hxx @@ -26,6 +26,7 @@ #include <vcl/vclptr.hxx> #include <vcl/toolbox.hxx> #include <vcl/toolboxid.hxx> +#include <vcl/weld/Toolbar.hxx> #include <svl/lstner.hxx> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/frame/FeatureStateEvent.hpp> diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index ab2e920f1d47..4cbec1a9ccad 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -22,6 +22,7 @@ #include "contwnd.hxx" #include <vcl/idle.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> class SvxSuperContourDlg; diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index c1940b98aa05..003092810f72 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -28,6 +28,7 @@ #include <vcl/weld/DialogController.hxx> #include <vcl/weld/Entry.hxx> #include <vcl/weld/TextView.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <svtools/inettbc.hxx> diff --git a/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx b/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx index cded09b95193..e9451f8c3022 100644 --- a/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx +++ b/svx/source/sidebar/fontwork/FontworkPropertyPanel.hxx @@ -21,6 +21,7 @@ #include <sfx2/sidebar/PanelLayout.hxx> #include <sfx2/weldutils.hxx> +#include <vcl/weld/Toolbar.hxx> namespace svx { diff --git a/svx/source/sidebar/lists/ListsPropertyPanel.hxx b/svx/source/sidebar/lists/ListsPropertyPanel.hxx index ec20bb4308dd..79a4ec3e6d8a 100644 --- a/svx/source/sidebar/lists/ListsPropertyPanel.hxx +++ b/svx/source/sidebar/lists/ListsPropertyPanel.hxx @@ -21,6 +21,7 @@ #include <sfx2/weldutils.hxx> #include <sfx2/sidebar/PanelLayout.hxx> +#include <vcl/weld/Toolbar.hxx> #include <com/sun/star/frame/XFrame.hpp> namespace svx::sidebar diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 49928429b3f0..607c55b5dc50 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -31,6 +31,7 @@ #include <tools/fldunit.hxx> #include <vcl/EnumContext.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> class ToolbarUnoDispatcher; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index de66876dc55d..4ea8e9f84103 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -30,6 +30,7 @@ #include <basegfx/range/b2drange.hxx> #include <vcl/EnumContext.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <svx/dlgutil.hxx> diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.hxx b/svx/source/sidebar/styles/StylesPropertyPanel.hxx index 66f773ae95a3..412a16696c52 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.hxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.hxx @@ -10,6 +10,7 @@ #include <sfx2/sidebar/PanelLayout.hxx> #include <sfx2/weldutils.hxx> +#include <vcl/weld/Toolbar.hxx> namespace svx::sidebar{ diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx index 9178b32a530d..30cf06bfbeaf 100644 --- a/svx/source/sidebar/text/TextPropertyPanel.hxx +++ b/svx/source/sidebar/text/TextPropertyPanel.hxx @@ -22,6 +22,7 @@ #include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <sfx2/weldutils.hxx> #include <vcl/EnumContext.hxx> +#include <vcl/weld/Toolbar.hxx> #include <sfx2/sidebar/PanelLayout.hxx> namespace svx::sidebar { diff --git a/sw/source/uibase/inc/QuickFindPanel.hxx b/sw/source/uibase/inc/QuickFindPanel.hxx index 40d33adfa909..371a74079966 100644 --- a/sw/source/uibase/inc/QuickFindPanel.hxx +++ b/sw/source/uibase/inc/QuickFindPanel.hxx @@ -19,6 +19,7 @@ #include <svtools/acceleratorexecute.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/Entry.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> namespace sw::sidebar diff --git a/sw/source/uibase/inc/navipi.hxx b/sw/source/uibase/inc/navipi.hxx index 69504b5d09d6..004e84dc46d3 100644 --- a/sw/source/uibase/inc/navipi.hxx +++ b/sw/source/uibase/inc/navipi.hxx @@ -29,6 +29,8 @@ #include <sfx2/weldutils.hxx> #include <sfx2/sidebar/PanelLayout.hxx> #include <vcl/weld/SpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> + #include "conttree.hxx" #include <ndarr.hxx> #include <memory> diff --git a/sw/source/uibase/sidebar/TableEditPanel.hxx b/sw/source/uibase/sidebar/TableEditPanel.hxx index cb51ef4422c4..4ae01f803039 100644 --- a/sw/source/uibase/sidebar/TableEditPanel.hxx +++ b/sw/source/uibase/sidebar/TableEditPanel.hxx @@ -17,6 +17,7 @@ #include <svx/relfld.hxx> #include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> namespace sw::sidebar { diff --git a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx index b00fb69e1213..193a749dd6fd 100644 --- a/sw/source/uibase/sidebar/WrapPropertyPanel.hxx +++ b/sw/source/uibase/sidebar/WrapPropertyPanel.hxx @@ -24,6 +24,7 @@ #include <sfx2/weldutils.hxx> #include <com/sun/star/frame/XFrame.hpp> #include <vcl/weld/ComboBox.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weld.hxx> namespace sw::sidebar { diff --git a/vcl/inc/qt5/QtInstanceBuilder.hxx b/vcl/inc/qt5/QtInstanceBuilder.hxx index e63e96c8f5a6..b46a85da956d 100644 --- a/vcl/inc/qt5/QtInstanceBuilder.hxx +++ b/vcl/inc/qt5/QtInstanceBuilder.hxx @@ -26,6 +26,7 @@ #include <vcl/weld/Paned.hxx> #include <vcl/weld/SpinButton.hxx> #include <vcl/weld/TextView.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/vcl/inc/qt5/QtInstanceToolbar.hxx b/vcl/inc/qt5/QtInstanceToolbar.hxx index 1f49ccd64c12..01752f11ce53 100644 --- a/vcl/inc/qt5/QtInstanceToolbar.hxx +++ b/vcl/inc/qt5/QtInstanceToolbar.hxx @@ -11,6 +11,8 @@ #include "QtInstanceWidget.hxx" +#include <vcl/weld/Toolbar.hxx> + #include <QtWidgets/QToolBar> class QtInstanceToolbar : public QtInstanceWidget, public virtual weld::Toolbar diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 932c118efec9..a2d0f7f285f7 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -20,6 +20,7 @@ #include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/SpinButton.hxx> #include <vcl/weld/TextView.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index c9fa85e2b9f1..5892268aa4bc 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -42,6 +42,7 @@ #include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/SpinButton.hxx> #include <vcl/weld/TextView.hxx> +#include <vcl/weld/Toolbar.hxx> #include <unx/genpspgraphics.h> #include <rtl/strbuf.hxx> #include <sal/log.hxx>
