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 <m.weghorn@posteo.de>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
@@ -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
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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 \
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user