cui/source/dialogs/colorpicker.cxx | 2 +- cui/source/inc/colorpicker.hxx | 3 +-- include/svx/hexcolorcontrol.hxx | 5 +---- 3 files changed, 3 insertions(+), 7 deletions(-)
New commits: commit eb26d32e9b7badd12136f42697ae983c74140c1d Author: Michael Weghorn <[email protected]> AuthorDate: Thu Dec 4 19:06:11 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Dec 8 07:45:43 2025 +0100 svx: Use #pragma once Change-Id: Ia0fb9324212168abf6cbba1772b19d016f63b550 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195092 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> (cherry picked from commit 083d48298416d4a1f579600ac8763df93254b786) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195145 diff --git a/include/svx/hexcolorcontrol.hxx b/include/svx/hexcolorcontrol.hxx index e1470c982a00..7d4297749ff5 100644 --- a/include/svx/hexcolorcontrol.hxx +++ b/include/svx/hexcolorcontrol.hxx @@ -17,8 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_SVX_HEXCOLOR_HXX -#define INCLUDED_SVX_HEXCOLOR_HXX +#pragma once #include <svx/svxdllapi.h> #include <tools/color.hxx> @@ -52,6 +51,4 @@ public: } -#endif // INCLUDED_SVX_HEXCOLOR_HXX - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 0b183e801d799e9488b4a1859eaad4af2cab611c Author: Michael Weghorn <[email protected]> AuthorDate: Thu Dec 4 19:02:52 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Mon Dec 8 07:45:35 2025 +0100 tdf#169505 Let ColorPickerDialog only subclass weld::GenericDialogController Nothing specific to SfxDialogController is used. This is one step in preparation of moving the class to vcl. Change-Id: Iee0dca30fd1f30d6f313d9287928f6a5fc4d83b1 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195091 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins (cherry picked from commit 6bdcc269420719891f27abeaf5f4b84b370cb591) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195144 diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index c150c5fc72f5..f527494c3989 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -579,7 +579,7 @@ void ColorSliderControl::SetValue(const Color& rColor, ColorMode eMode, double d } ColorPickerDialog::ColorPickerDialog(weld::Window* pParent, const Color& rColor, vcl::ColorPickerMode eDialogMode) - : SfxDialogController(pParent, u"cui/ui/colorpickerdialog.ui"_ustr, u"ColorPicker"_ustr) + : weld::GenericDialogController(pParent, u"cui/ui/colorpickerdialog.ui"_ustr, u"ColorPicker"_ustr) , m_xColorField(new weld::CustomWeld(*m_xBuilder, u"colorField"_ustr, m_aColorField)) , m_xColorSlider(new weld::CustomWeld(*m_xBuilder, u"colorSlider"_ustr, m_aColorSlider)) , m_xColorPreview(new weld::CustomWeld(*m_xBuilder, u"preview"_ustr, m_aColorPreview)) diff --git a/cui/source/inc/colorpicker.hxx b/cui/source/inc/colorpicker.hxx index 104bd1cbab79..e3a2b3c6d40d 100644 --- a/cui/source/inc/colorpicker.hxx +++ b/cui/source/inc/colorpicker.hxx @@ -23,7 +23,6 @@ #include <vcl/customweld.hxx> #include <vcl/virdev.hxx> #include <vcl/weld.hxx> -#include <sfx2/basedlgs.hxx> #include <svx/hexcolorcontrol.hxx> #include <o3tl/typed_flags_set.hxx> @@ -160,7 +159,7 @@ private: double mdValue; }; -class ColorPickerDialog : public SfxDialogController +class ColorPickerDialog : public weld::GenericDialogController { private: ColorFieldControl m_aColorField;
