chart2/source/inc/ChartColorPalettes.hxx | 1 cui/source/inc/AdditionsDialog.hxx | 1 cui/source/inc/FontFeaturesDialog.hxx | 1 cui/source/inc/SpellDialog.hxx | 1 dbaccess/source/ui/inc/sqledit.hxx | 1 desktop/source/deployment/gui/dp_gui_extensionboxwithbuttons.hxx | 1 desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 1 extensions/source/bibliography/general.hxx | 1 extensions/source/propctrlr/browserlistbox.hxx | 1 formula/source/ui/dlg/ControlHelper.hxx | 1 formula/source/ui/dlg/parawin.hxx | 1 include/sfx2/dinfdlg.hxx | 1 include/sfx2/sidebar/Deck.hxx | 1 include/sfx2/thumbnailview.hxx | 1 include/svtools/addresstemplate.hxx | 1 include/svtools/valueset.hxx | 1 include/svx/charmap.hxx | 1 include/svx/galctrl.hxx | 1 include/svx/rubydialog.hxx | 1 include/vcl/jsdialog/executor.hxx | 1 include/vcl/weld/ScrolledWindow.hxx | 74 ++++++++++ include/vcl/weld/weld.hxx | 58 ------- reportdesign/source/ui/inc/CondFormat.hxx | 1 sc/source/ui/inc/condformatdlg.hxx | 2 sc/source/ui/inc/csvtablebox.hxx | 1 sc/source/ui/inc/datafdlg.hxx | 1 sc/source/ui/inc/dataproviderdlg.hxx | 1 sc/source/ui/inc/inputwin.hxx | 1 sc/source/ui/inc/optsolver.hxx | 1 sc/source/ui/inc/retypepassdlg.hxx | 1 sc/source/ui/inc/tpsort.hxx | 1 sd/source/ui/annotations/annotationwindow.hxx | 1 sd/source/ui/dlg/RemoteDialogClientBox.hxx | 1 starmath/inc/dialog.hxx | 1 starmath/inc/edit.hxx | 1 sw/inc/AnnotationWin.hxx | 1 sw/source/ui/dbui/createaddresslistdialog.cxx | 1 sw/source/ui/dbui/mmaddressblockpage.cxx | 1 sw/source/uibase/inc/mailmergehelper.hxx | 1 sw/source/uibase/inc/swuicnttab.hxx | 1 vcl/inc/printdlg.hxx | 1 vcl/inc/qt5/QtInstanceScrolledWindow.hxx | 2 vcl/inc/salvtables.hxx | 1 vcl/unx/gtk3/gtkinst.cxx | 1 44 files changed, 118 insertions(+), 58 deletions(-)
New commits: commit e75604dcf77802288b8eabff5d54c8d8e8ae278f Author: Michael Weghorn <[email protected]> AuthorDate: Wed Dec 31 00:09:00 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Dec 31 07:50:34 2025 +0100 weld: Move weld::ScrolledWindow 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: I2c8a9591a88ad26478243eb3f61214dc0efc51a1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196341 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/chart2/source/inc/ChartColorPalettes.hxx b/chart2/source/inc/ChartColorPalettes.hxx index 08ed7c66982a..a4bda8bda0e8 100644 --- a/chart2/source/inc/ChartColorPalettes.hxx +++ b/chart2/source/inc/ChartColorPalettes.hxx @@ -15,6 +15,7 @@ #include <vcl/weld/customweld.hxx> #include <vcl/weld/Builder.hxx> #include <vcl/weld/IconView.hxx> +#include <vcl/weld/ScrolledWindow.hxx> class MouseEvent; diff --git a/cui/source/inc/AdditionsDialog.hxx b/cui/source/inc/AdditionsDialog.hxx index 6b92115bb89e..102ea773c7f5 100644 --- a/cui/source/inc/AdditionsDialog.hxx +++ b/cui/source/inc/AdditionsDialog.hxx @@ -14,6 +14,7 @@ #include <rtl/ref.hxx> #include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> // Detect changes on the UI diff --git a/cui/source/inc/FontFeaturesDialog.hxx b/cui/source/inc/FontFeaturesDialog.hxx index 6b1aece56698..6f5dbd0b9926 100644 --- a/cui/source/inc/FontFeaturesDialog.hxx +++ b/cui/source/inc/FontFeaturesDialog.hxx @@ -13,6 +13,7 @@ #include <vcl/svapp.hxx> #include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> #include <vcl/font/Feature.hxx> #include <svx/fntctrl.hxx> diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index f85ff3cedffe..b207d9c3b59a 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -28,6 +28,7 @@ #include <svl/undo.hxx> #include <svx/weldeditview.hxx> #include <editeng/SpellPortions.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/customweld.hxx> diff --git a/dbaccess/source/ui/inc/sqledit.hxx b/dbaccess/source/ui/inc/sqledit.hxx index d0f8672cc698..cfb784197129 100644 --- a/dbaccess/source/ui/inc/sqledit.hxx +++ b/dbaccess/source/ui/inc/sqledit.hxx @@ -25,6 +25,7 @@ #include <svtools/colorcfg.hxx> #include <svx/weldeditview.hxx> #include <vcl/timer.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <mutex> namespace com::sun::star::beans { class XMultiPropertySet; } diff --git a/desktop/source/deployment/gui/dp_gui_extensionboxwithbuttons.hxx b/desktop/source/deployment/gui/dp_gui_extensionboxwithbuttons.hxx index a647013a9df8..3fdef90c107e 100644 --- a/desktop/source/deployment/gui/dp_gui_extensionboxwithbuttons.hxx +++ b/desktop/source/deployment/gui/dp_gui_extensionboxwithbuttons.hxx @@ -23,6 +23,7 @@ #include <tools/gen.hxx> #include <vcl/event.hxx> +#include <vcl/weld/ScrolledWindow.hxx> namespace dp_gui { diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index c88740263572..4bda6bf2184d 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -21,6 +21,7 @@ #include <rtl/ustring.hxx> #include <vcl/image.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx index 9708174ffa1f..2d202125cc93 100644 --- a/extensions/source/bibliography/general.hxx +++ b/extensions/source/bibliography/general.hxx @@ -22,6 +22,7 @@ #include <sal/config.h> #include <vcl/InterimItemWindow.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include "bibshortcuthandler.hxx" diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 8262ba3c13ea..0a7bafb03a0a 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/inspection/XPropertyHandler.hpp> #include <utility> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> #include <rtl/ref.hxx> diff --git a/formula/source/ui/dlg/ControlHelper.hxx b/formula/source/ui/dlg/ControlHelper.hxx index 2495474516ce..db86591e1d86 100644 --- a/formula/source/ui/dlg/ControlHelper.hxx +++ b/formula/source/ui/dlg/ControlHelper.hxx @@ -19,6 +19,7 @@ #pragma once #include <formula/funcutl.hxx> +#include <vcl/weld/ScrolledWindow.hxx> namespace formula { diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index 10b9d129b852..013e0fd1a973 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -21,6 +21,7 @@ #include <formula/funcutl.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> #include "ControlHelper.hxx" #include <vector> diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index b9bf4ecf644c..ce98b7cc1e32 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -34,6 +34,7 @@ #include <vcl/idle.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weldutils.hxx> #include <sfx2/tabdlg.hxx> diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx index d027cc48f456..31282603cf01 100644 --- a/include/sfx2/sidebar/Deck.hxx +++ b/include/sfx2/sidebar/Deck.hxx @@ -20,6 +20,7 @@ #include <sfx2/sidebar/Panel.hxx> #include <vcl/InterimItemWindow.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> namespace sfx2::sidebar diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 572c3d344ce8..f67eeddb05e5 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -17,6 +17,7 @@ #include <vector> #include <vcl/settings.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> class Bitmap; diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index a76834691cf1..52ed85a38ffb 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -23,6 +23,7 @@ #include <memory> #include <svtools/svtdllapi.h> #include <vcl/weld/DialogController.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> namespace com :: sun :: star :: container { class XNameAccess; } diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 71c1a494ff96..4ea0c274b967 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -22,6 +22,7 @@ #include <svtools/svtdllapi.h> #include <vcl/wintypes.hxx> #include <vcl/image.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> #include <rtl/ref.hxx> #include <memory> diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index c09c0637deb2..3b999ebe11c6 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -32,6 +32,7 @@ #include <tools/link.hxx> #include <vcl/metric.hxx> #include <vcl/vclptr.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index fb973316dbf1..955ed8fa987d 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -23,6 +23,7 @@ #include <vcl/graph.hxx> #include <svtools/valueset.hxx> #include <vcl/GraphicObject.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index e8476992015a..8d194731753c 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -25,6 +25,7 @@ #include <sfx2/basedlgs.hxx> #include <svx/svxdllapi.h> #include <rtl/ref.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> class SvxRubyDialog; diff --git a/include/vcl/jsdialog/executor.hxx b/include/vcl/jsdialog/executor.hxx index 3cfaa59f856e..ecf85ff0eead 100644 --- a/include/vcl/jsdialog/executor.hxx +++ b/include/vcl/jsdialog/executor.hxx @@ -12,6 +12,7 @@ #include <vcl/dllapi.h> #include <vcl/uitest/uiobject.hxx> #include <vcl/weld/IconView.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <unordered_map> diff --git a/include/vcl/weld/ScrolledWindow.hxx b/include/vcl/weld/ScrolledWindow.hxx new file mode 100644 index 000000000000..26709b5749f2 --- /dev/null +++ b/include/vcl/weld/ScrolledWindow.hxx @@ -0,0 +1,74 @@ +/* -*- 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 ScrolledWindow : virtual public Widget +{ + friend class ::LOKTrigger; + + Link<ScrolledWindow&, void> m_aVValueChangeHdl; + Link<ScrolledWindow&, void> m_aHValueChangeHdl; + +protected: + void signal_vadjustment_value_changed() { m_aVValueChangeHdl.Call(*this); } + void signal_hadjustment_value_changed() { m_aHValueChangeHdl.Call(*this); } + +public: + virtual void hadjustment_configure(int value, int upper, int step_increment, int page_increment, + int page_size) + = 0; + virtual int hadjustment_get_value() const = 0; + virtual void hadjustment_set_value(int value) = 0; + virtual int hadjustment_get_upper() const = 0; + virtual void hadjustment_set_upper(int upper) = 0; + virtual int hadjustment_get_page_size() const = 0; + virtual void hadjustment_set_page_size(int size) = 0; + virtual void hadjustment_set_page_increment(int size) = 0; + virtual void hadjustment_set_step_increment(int size) = 0; + virtual void set_hpolicy(VclPolicyType eHPolicy) = 0; + virtual VclPolicyType get_hpolicy() const = 0; + void connect_hadjustment_value_changed(const Link<ScrolledWindow&, void>& rLink) + { + m_aHValueChangeHdl = rLink; + } + + virtual void vadjustment_configure(int value, int upper, int step_increment, int page_increment, + int page_size) + = 0; + virtual int vadjustment_get_value() const = 0; + virtual void vadjustment_set_value(int value) = 0; + virtual int vadjustment_get_upper() const = 0; + virtual void vadjustment_set_upper(int upper) = 0; + virtual int vadjustment_get_page_size() const = 0; + virtual void vadjustment_set_page_size(int size) = 0; + virtual void vadjustment_set_page_increment(int size) = 0; + virtual void vadjustment_set_step_increment(int size) = 0; + virtual void set_vpolicy(VclPolicyType eVPolicy) = 0; + virtual VclPolicyType get_vpolicy() const = 0; + void connect_vadjustment_value_changed(const Link<ScrolledWindow&, void>& rLink) + { + m_aVValueChangeHdl = rLink; + } + virtual int get_scroll_thickness() const = 0; + virtual void set_scroll_thickness(int nThickness) = 0; + + //trying to use custom color for a scrollbar is generally a bad idea. + virtual void customize_scrollbars(const Color& rBackgroundColor, const Color& rShadowColor, + const Color& rFaceColor) + = 0; +}; +} + +/* 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 0911b9daee23..f27b63a65127 100644 --- a/include/vcl/weld/weld.hxx +++ b/include/vcl/weld/weld.hxx @@ -452,62 +452,6 @@ public: virtual int get_position() const = 0; }; -class VCL_DLLPUBLIC ScrolledWindow : virtual public Widget -{ - friend class ::LOKTrigger; - - Link<ScrolledWindow&, void> m_aVValueChangeHdl; - Link<ScrolledWindow&, void> m_aHValueChangeHdl; - -protected: - void signal_vadjustment_value_changed() { m_aVValueChangeHdl.Call(*this); } - void signal_hadjustment_value_changed() { m_aHValueChangeHdl.Call(*this); } - -public: - virtual void hadjustment_configure(int value, int upper, int step_increment, int page_increment, - int page_size) - = 0; - virtual int hadjustment_get_value() const = 0; - virtual void hadjustment_set_value(int value) = 0; - virtual int hadjustment_get_upper() const = 0; - virtual void hadjustment_set_upper(int upper) = 0; - virtual int hadjustment_get_page_size() const = 0; - virtual void hadjustment_set_page_size(int size) = 0; - virtual void hadjustment_set_page_increment(int size) = 0; - virtual void hadjustment_set_step_increment(int size) = 0; - virtual void set_hpolicy(VclPolicyType eHPolicy) = 0; - virtual VclPolicyType get_hpolicy() const = 0; - void connect_hadjustment_value_changed(const Link<ScrolledWindow&, void>& rLink) - { - m_aHValueChangeHdl = rLink; - } - - virtual void vadjustment_configure(int value, int upper, int step_increment, int page_increment, - int page_size) - = 0; - virtual int vadjustment_get_value() const = 0; - virtual void vadjustment_set_value(int value) = 0; - virtual int vadjustment_get_upper() const = 0; - virtual void vadjustment_set_upper(int upper) = 0; - virtual int vadjustment_get_page_size() const = 0; - virtual void vadjustment_set_page_size(int size) = 0; - virtual void vadjustment_set_page_increment(int size) = 0; - virtual void vadjustment_set_step_increment(int size) = 0; - virtual void set_vpolicy(VclPolicyType eVPolicy) = 0; - virtual VclPolicyType get_vpolicy() const = 0; - void connect_vadjustment_value_changed(const Link<ScrolledWindow&, void>& rLink) - { - m_aVValueChangeHdl = rLink; - } - virtual int get_scroll_thickness() const = 0; - virtual void set_scroll_thickness(int nThickness) = 0; - - //trying to use custom color for a scrollbar is generally a bad idea. - virtual void customize_scrollbars(const Color& rBackgroundColor, const Color& rShadowColor, - const Color& rFaceColor) - = 0; -}; - class VCL_DLLPUBLIC Frame : virtual public Container { public: diff --git a/reportdesign/source/ui/inc/CondFormat.hxx b/reportdesign/source/ui/inc/CondFormat.hxx index 48a7d7bc794d..12782c56c6c1 100644 --- a/reportdesign/source/ui/inc/CondFormat.hxx +++ b/reportdesign/source/ui/inc/CondFormat.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/report/XReportControlModel.hpp> #include <vcl/weld/DialogController.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> #include <vector> diff --git a/sc/source/ui/inc/condformatdlg.hxx b/sc/source/ui/inc/condformatdlg.hxx index b35651ed3a01..c376d9f2ef95 100644 --- a/sc/source/ui/inc/condformatdlg.hxx +++ b/sc/source/ui/inc/condformatdlg.hxx @@ -15,6 +15,8 @@ #include "anyrefdg.hxx" +#include <vcl/weld/ScrolledWindow.hxx> + #include <memory> #define DLG_RET_ADD 8 diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 32e79a470ea3..a9d7bae77ad8 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -21,6 +21,7 @@ #include <vcl/idle.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> #include <scdllapi.h> #include "csvcontrol.hxx" diff --git a/sc/source/ui/inc/datafdlg.hxx b/sc/source/ui/inc/datafdlg.hxx index e0992c4b8fa0..0151e89b5c66 100644 --- a/sc/source/ui/inc/datafdlg.hxx +++ b/sc/source/ui/inc/datafdlg.hxx @@ -10,6 +10,7 @@ #pragma once #include <vcl/weld/DialogController.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> #include <types.hxx> #include "viewfunc.hxx" diff --git a/sc/source/ui/inc/dataproviderdlg.hxx b/sc/source/ui/inc/dataproviderdlg.hxx index a90d7e6bc4f0..5a0d2d950ece 100644 --- a/sc/source/ui/inc/dataproviderdlg.hxx +++ b/sc/source/ui/inc/dataproviderdlg.hxx @@ -16,6 +16,7 @@ #include <com/sun/star/awt/XWindow.hpp> #include <vcl/idle.hxx> #include <vcl/weld/DialogController.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> #include "datatableview.hxx" #include <memory> diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index b3779253a8f2..06f83bd7cb9d 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -25,6 +25,7 @@ #include <vcl/toolbox.hxx> #include <vcl/InterimItemWindow.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> #include <sfx2/childwin.hxx> #include <svl/lstner.hxx> diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx index 35570f7d09d4..df36f1cbc6dc 100644 --- a/sc/source/ui/inc/optsolver.hxx +++ b/sc/source/ui/inc/optsolver.hxx @@ -25,6 +25,7 @@ #include <SolverSettings.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/table/CellAddress.hpp> +#include <vcl/weld/ScrolledWindow.hxx> #include <string_view> #include <vector> diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 796e4a06257f..15d7704316ec 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -21,6 +21,7 @@ #include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> #include <tabprotection.hxx> #include <memory> diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index c5569308f3a2..e6f65d027729 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -26,6 +26,7 @@ #include <svx/langbox.hxx> #include <unotools/collatorwrapper.hxx> #include <vcl/idle.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include "sortkeydlg.hxx" diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index f2a2dca34a7a..00c4da3fcfed 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -20,6 +20,7 @@ #pragma once #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> #include <tools/long.hxx> #include <svx/weldeditview.hxx> diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index 529cb8578806..a1e774dd6c9a 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -20,6 +20,7 @@ #pragma once #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index a2a4c11906a3..3bd26a0abe09 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -25,6 +25,7 @@ #include <vcl/weld/DialogController.hxx> #include <vcl/weld/EntryTreeView.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> #include "symbol.hxx" diff --git a/starmath/inc/edit.hxx b/starmath/inc/edit.hxx index e3d06eb59378..a15c80c65cc2 100644 --- a/starmath/inc/edit.hxx +++ b/starmath/inc/edit.hxx @@ -21,6 +21,7 @@ #include <svx/weldeditview.hxx> #include <vcl/idle.hxx> +#include <vcl/weld/ScrolledWindow.hxx> class SmDocShell; class SmViewShell; diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 81e750774efd..2db6f5b5fab7 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -24,6 +24,7 @@ #include <tools/date.hxx> #include <tools/time.hxx> #include <vcl/InterimItemWindow.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> #include "postithelper.hxx" diff --git a/sw/source/ui/dbui/createaddresslistdialog.cxx b/sw/source/ui/dbui/createaddresslistdialog.cxx index a9c53c50cf1f..f11880d82597 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.cxx +++ b/sw/source/ui/dbui/createaddresslistdialog.cxx @@ -28,6 +28,7 @@ #include <mmconfigitem.hxx> #include <utility> #include <vcl/svapp.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/docfile.hxx> #include <rtl/textenc.h> diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 148510203f2e..a2f66e335042 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -29,6 +29,7 @@ #include <vcl/commandevent.hxx> #include <vcl/event.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> #include <vcl/transfer.hxx> #include <mmconfigitem.hxx> diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index 7ad1a7687a35..b65117389fca 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -29,6 +29,7 @@ #include <cppuhelper/implbase.hxx> #include <comphelper/compbase.hxx> #include <utility> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <rtl/ustring.hxx> diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 3fe702bb39a4..a59654584db7 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -24,6 +24,7 @@ #include <vcl/idle.hxx> #include <vcl/weld/Builder.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 5dc9c5f08f15..f8250f01101b 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -25,6 +25,7 @@ #include <vcl/print.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <map> diff --git a/vcl/inc/qt5/QtInstanceScrolledWindow.hxx b/vcl/inc/qt5/QtInstanceScrolledWindow.hxx index 8312cf72a937..4fff7ee73b58 100644 --- a/vcl/inc/qt5/QtInstanceScrolledWindow.hxx +++ b/vcl/inc/qt5/QtInstanceScrolledWindow.hxx @@ -11,6 +11,8 @@ #include "QtInstanceWidget.hxx" +#include <vcl/weld/ScrolledWindow.hxx> + #include <QtWidgets/QScrollArea> class QtInstanceScrolledWindow : public QtInstanceWidget, public virtual weld::ScrolledWindow diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 228e381a7e18..b59b35e34a38 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -13,6 +13,7 @@ #include <vcl/weld/DialogController.hxx> #include <vcl/weld/EntryTreeView.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/ScrolledWindow.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 5bcc294881e0..7d4ecb45ccd4 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -37,6 +37,7 @@ #include <vcl/transfer.hxx> #include <vcl/toolkit/floatwin.hxx> #include <vcl/weld/MetricSpinButton.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <unx/genpspgraphics.h> #include <rtl/strbuf.hxx> #include <sal/log.hxx> commit 3e88d4bb51f60550b52ff5e08884ac089ffc0f93 Author: Michael Weghorn <[email protected]> AuthorDate: Tue Dec 30 23:35:37 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Wed Dec 31 07:50:25 2025 +0100 weld: Drop unused forward declaration Change-Id: I4c46c0d653508c382476fbe996f8fd00953c076c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196340 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/vcl/weld/weld.hxx b/include/vcl/weld/weld.hxx index 4e892231fec3..0911b9daee23 100644 --- a/include/vcl/weld/weld.hxx +++ b/include/vcl/weld/weld.hxx @@ -508,8 +508,6 @@ public: = 0; }; -class Label; - class VCL_DLLPUBLIC Frame : virtual public Container { public:
