cui/source/inc/colorpicker.hxx | 2 +- cui/source/inc/cuitabarea.hxx | 2 +- include/vcl/hexcolorcontrol.hxx | 4 ++-- solenv/clang-format/excludelist | 2 +- svx/Library_svxcore.mk | 1 - vcl/Library_vcl.mk | 2 ++ vcl/source/window/hexcolorcontrol.cxx | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-)
New commits: commit c80637bc429853ea034998fce49b980ef52d76fa Author: Michael Weghorn <[email protected]> AuthorDate: Thu Dec 4 19:16:37 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Dec 6 08:39:06 2025 +0100 tdf#169505 Move HexColorControl from svx to vcl ... in preparation of moving ColorPicker to vcl in an upcoming commit, too. Change-Id: I0ca1041073856253905022517f532134b7d243cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195093 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/cui/source/inc/colorpicker.hxx b/cui/source/inc/colorpicker.hxx index e3a2b3c6d40d..dcc780dfd3ca 100644 --- a/cui/source/inc/colorpicker.hxx +++ b/cui/source/inc/colorpicker.hxx @@ -21,9 +21,9 @@ #include <vcl/ColorDialog.hxx> #include <vcl/customweld.hxx> +#include <vcl/hexcolorcontrol.hxx> #include <vcl/virdev.hxx> #include <vcl/weld.hxx> -#include <svx/hexcolorcontrol.hxx> #include <o3tl/typed_flags_set.hxx> enum class UpdateFlags diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index bb7e897846db..c1acc7f2ce14 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -22,11 +22,11 @@ #include <svx/dlgctrl.hxx> #include <svx/xflasit.hxx> #include <svx/tabarea.hxx> -#include <svx/hexcolorcontrol.hxx> #include <svx/SvxColorValueSet.hxx> #include <svx/SvxPresetListBox.hxx> #include <svx/PaletteManager.hxx> #include <svx/svdview.hxx> +#include <vcl/hexcolorcontrol.hxx> class ColorListBox; class SdrModel; diff --git a/include/svx/hexcolorcontrol.hxx b/include/vcl/hexcolorcontrol.hxx similarity index 96% rename from include/svx/hexcolorcontrol.hxx rename to include/vcl/hexcolorcontrol.hxx index 7d4297749ff5..aaf396c9a4f9 100644 --- a/include/svx/hexcolorcontrol.hxx +++ b/include/vcl/hexcolorcontrol.hxx @@ -19,9 +19,9 @@ #pragma once -#include <svx/svxdllapi.h> #include <tools/color.hxx> #include <tools/link.hxx> +#include <vcl/dllapi.h> namespace weld { class Entry; } @@ -29,7 +29,7 @@ struct ImplSVEvent; namespace weld { -class SVXCORE_DLLPUBLIC HexColorControl +class VCL_DLLPUBLIC HexColorControl { private: std::unique_ptr<weld::Entry> m_xEntry; diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 8081c827fc75..ab94d7cb64a1 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -5626,7 +5626,6 @@ include/svx/grfflt.hxx include/svx/gridctrl.hxx include/svx/hdft.hxx include/svx/helperhittest3d.hxx -include/svx/hexcolorcontrol.hxx include/svx/hlnkitem.hxx include/svx/hyperdlg.hxx include/svx/ifaceids.hxx @@ -6101,6 +6100,7 @@ include/vcl/graphictools.hxx include/vcl/hatch.hxx include/vcl/headbar.hxx include/vcl/help.hxx +include/vcl/hexcolorcontrol.hxx include/vcl/i18nhelp.hxx include/vcl/idle.hxx include/vcl/image.hxx diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index ad98cd64917f..e2d178b688f5 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -121,7 +121,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/diagram/IDiagramHelper \ svx/source/dialog/dialmgr \ svx/source/dialog/dlgutil \ - svx/source/dialog/hexcolorcontrol \ svx/source/dialog/framelink \ svx/source/dialog/framelinkarray \ svx/source/dialog/langbox \ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 617e22e31dc1..7ca18aa0a5a0 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -69,6 +69,7 @@ $(eval $(call gb_Library_use_libraries,vcl,\ $(if $(filter OPENCL,$(BUILD_TYPE)),opencl) \ sal \ salhelper \ + sax \ sot \ svl \ tl \ @@ -188,6 +189,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/window/DocWindow \ vcl/source/window/event \ vcl/source/window/floatwin \ + vcl/source/window/hexcolorcontrol \ $(if $(ENABLE_WASM_STRIP_SPLASH),,vcl/source/window/introwin) \ vcl/source/window/keycod \ vcl/source/window/keyevent \ diff --git a/svx/source/dialog/hexcolorcontrol.cxx b/vcl/source/window/hexcolorcontrol.cxx similarity index 99% rename from svx/source/dialog/hexcolorcontrol.cxx rename to vcl/source/window/hexcolorcontrol.cxx index 1c043359d73d..cb5f73b43ebf 100644 --- a/svx/source/dialog/hexcolorcontrol.cxx +++ b/vcl/source/window/hexcolorcontrol.cxx @@ -18,8 +18,8 @@ */ #include <sax/tools/converter.hxx> -#include <svx/hexcolorcontrol.hxx> #include <rtl/character.hxx> +#include <vcl/hexcolorcontrol.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx>
