From 074dad2349776491031f1c7dc2e1d002ed5a64ab Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Wed, 10 Jun 2026 12:47:45 +0200 Subject: [PATCH] svx: Move SvxColorValueSet from svxcore to svx By now, it's only used by SvxColorValueSet_docking/SvxColorDockingWindow which both are in svx as well. Move from svxcore to svx and stop exporting (drop the SVXCORE_DLLPUBLIC). While at it, also drop an unused include. Change-Id: I09fdc1cd42bfa5143f50d8960352155b5647a831 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/206309 Reviewed-by: Michael Weghorn Tested-by: Jenkins --- svx/Library_svx.mk | 1 + svx/Library_svxcore.mk | 1 - svx/inc/SvxColorValueSet.hxx | 4 +--- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk index 5a1918a8b22a..592488a1f90c 100644 --- a/svx/Library_svx.mk +++ b/svx/Library_svx.mk @@ -272,6 +272,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\ svx/source/tbxctrls/bulletsnumbering \ svx/source/tbxctrls/colrctrl \ svx/source/tbxctrls/SvxColorChildWindow \ + svx/source/tbxctrls/SvxColorValueSet \ svx/source/tbxctrls/fillctrl \ svx/source/tbxctrls/formatpaintbrushctrl \ svx/source/tbxctrls/grafctrl \ diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk index f9a1342380b4..22d5e9b56156 100644 --- a/svx/Library_svxcore.mk +++ b/svx/Library_svxcore.mk @@ -439,7 +439,6 @@ $(eval $(call gb_Library_add_exception_objects,svxcore,\ svx/source/tbxctrls/PaletteManager \ svx/source/tbxctrls/tbcontrl \ svx/source/tbxctrls/tbxcolorupdate \ - svx/source/tbxctrls/SvxColorValueSet \ svx/source/tbxctrls/StylesPreviewToolBoxControl \ svx/source/tbxctrls/StylesPreviewWindow \ svx/source/toolbars/extrusionbar \ diff --git a/svx/inc/SvxColorValueSet.hxx b/svx/inc/SvxColorValueSet.hxx index 35e814b5494b..ee7acbfb160b 100644 --- a/svx/inc/SvxColorValueSet.hxx +++ b/svx/inc/SvxColorValueSet.hxx @@ -21,10 +21,8 @@ #include #include -#include -#include -class SVXCORE_DLLPUBLIC SvxColorValueSet : public ValueSet, public IColorSet +class SvxColorValueSet : public ValueSet, public IColorSet { public: SvxColorValueSet(std::unique_ptr pWindow);