diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2018-12-09 23:16:18 -0900 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2019-01-01 23:02:05 +0100 |
| commit | 82df20eeb8f071aaf3780b111aaa27fbc1b2dc9a (patch) | |
| tree | 805ecd0905cced32e79a209f9276e2e419412396 /cui/source/options/optchart.hxx | |
| parent | b8d2d78974fcb3e95de87dd98103e5bc015b7687 (diff) | |
tdf#105225 Add palette selection to options charts default colors
Change-Id: I42d1f155238213e41b8a57ce47b70cfeb2408b26
Reviewed-on: https://gerrit.libreoffice.org/64980
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'cui/source/options/optchart.hxx')
| -rw-r--r-- | cui/source/options/optchart.hxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index fc7d01091871..19db288db8e1 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -26,6 +26,7 @@ #include <svx/dlgctrl.hxx> #include <vcl/button.hxx> #include <svx/xtable.hxx> +#include <svx/PaletteManager.hxx> #include "cfgchart.hxx" @@ -35,24 +36,24 @@ class SvxDefaultColorOptPage : public SfxTabPage { private: VclPtr<ListBox> m_pLbChartColors; - VclPtr<ValueSet> m_pValSetColorBox; + VclPtr<ListBox> m_pLbPaletteSelector; + VclPtr<SvxColorValueSet> m_pValSetColorBox; VclPtr<PushButton> m_pPBDefault; VclPtr<PushButton> m_pPBAdd; VclPtr<PushButton> m_pPBRemove; std::unique_ptr<SvxChartOptions> pChartOptions; std::unique_ptr<SvxChartColorTableItem> pColorConfig; - XColorListRef pColorList; ImpColorList aColorList; + PaletteManager aPaletteManager; DECL_LINK( ResetToDefaults, Button *, void ); DECL_LINK( AddChartColor, Button *, void ); DECL_LINK( RemoveChartColor, Button *, void ); - DECL_LINK( ListClickedHdl, ListBox&, void ); DECL_LINK(BoxClickedHdl, ValueSet*, void); + DECL_LINK( SelectPaletteLbHdl, ListBox&, void ); - void FillColorBox(); - long GetColorIndex( const Color& rCol ); + void FillPaletteLB(); private: void InsertColorEntry(const XColorEntry& rEntry, sal_Int32 nPos = LISTBOX_APPEND); @@ -60,8 +61,6 @@ private: void ModifyColorEntry(const XColorEntry& rEntry, sal_Int32 nPos); void ClearColorEntries(); void FillBoxChartColorLB(); - Color GetEntryColor(sal_Int32 nPos) const; - Color GetSelectEntryColor() const; public: SvxDefaultColorOptPage( vcl::Window* pParent, const SfxItemSet& rInAttrs ); |