include/vcl/weld/ColorChooserDialog.hxx | 25 +++++++++++++++++++++++++ include/vcl/weld/weld.hxx | 7 ------- vcl/inc/qt5/QtInstance.hxx | 1 + vcl/inc/qt5/QtInstanceColorChooserDialog.hxx | 2 ++ vcl/inc/salinst.hxx | 1 + vcl/inc/salvtables.hxx | 1 + vcl/inc/unx/gtk/gtkinst.hxx | 1 + 7 files changed, 31 insertions(+), 7 deletions(-)
New commits: commit 7829c6a12aea8e7b66acb1f86a04bc81a71d2d4c Author: Michael Weghorn <[email protected]> AuthorDate: Tue Feb 10 11:56:32 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Tue Feb 10 23:57:11 2026 +0100 weld: Move weld::ColorChooserDialog 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: Ifbea8bf690743019988be5309d0ae96a06b4f305 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/199067 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/include/vcl/weld/ColorChooserDialog.hxx b/include/vcl/weld/ColorChooserDialog.hxx new file mode 100644 index 000000000000..8f3b358c04f1 --- /dev/null +++ b/include/vcl/weld/ColorChooserDialog.hxx @@ -0,0 +1,25 @@ +/* -*- 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 ColorChooserDialog : virtual public Dialog +{ +public: + virtual void set_color(const Color& rColor) = 0; + virtual Color get_color() const = 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 59cb2c3b48a5..6981faa7be0a 100644 --- a/include/vcl/weld/weld.hxx +++ b/include/vcl/weld/weld.hxx @@ -913,13 +913,6 @@ public: void connect_closed(const Link<weld::Popover&, void>& rLink) { m_aCloseHdl = rLink; } }; -class VCL_DLLPUBLIC ColorChooserDialog : virtual public Dialog -{ -public: - virtual void set_color(const Color& rColor) = 0; - virtual Color get_color() const = 0; -}; - class VCL_DLLPUBLIC SizeGroup { public: diff --git a/vcl/inc/qt5/QtInstance.hxx b/vcl/inc/qt5/QtInstance.hxx index 51974900a1db..acf21b57e979 100644 --- a/vcl/inc/qt5/QtInstance.hxx +++ b/vcl/inc/qt5/QtInstance.hxx @@ -25,6 +25,7 @@ #include <unx/geninst.h> #include <salusereventlist.hxx> #include <vcl/timer.hxx> +#include <vcl/weld/ColorChooserDialog.hxx> #include <osl/conditn.hxx> diff --git a/vcl/inc/qt5/QtInstanceColorChooserDialog.hxx b/vcl/inc/qt5/QtInstanceColorChooserDialog.hxx index 53fdec7b08d6..84adc9aa5e95 100644 --- a/vcl/inc/qt5/QtInstanceColorChooserDialog.hxx +++ b/vcl/inc/qt5/QtInstanceColorChooserDialog.hxx @@ -11,6 +11,8 @@ #include "QtInstanceDialog.hxx" +#include <vcl/weld/ColorChooserDialog.hxx> + #include <QtWidgets/QColorDialog> class QtInstanceColorChooserDialog : public QtInstanceDialog, diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index eabea20b23ce..16d93245b6f1 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -26,6 +26,7 @@ #include <vcl/dllapi.h> #include <vcl/salgtype.hxx> #include <vcl/vclenum.hxx> +#include <vcl/weld/ColorChooserDialog.hxx> #include <vcl/weld/weld.hxx> #include "displayconnectiondispatch.hxx" diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 65924a2cfae3..82df100911ad 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -11,6 +11,7 @@ #include <vcl/builder.hxx> #include <vcl/weld/Assistant.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ColorChooserDialog.hxx> #include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/DrawingArea.hxx> diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx index efdc25b15214..f5c6302c95e1 100644 --- a/vcl/inc/unx/gtk/gtkinst.hxx +++ b/vcl/inc/unx/gtk/gtkinst.hxx @@ -34,6 +34,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <cppuhelper/compbase.hxx> +#include <vcl/weld/ColorChooserDialog.hxx> #include <vcl/weld/weld.hxx> #include <vcl/weld/weldutils.hxx> #include <gtk/gtk.h>
