diff options
author | Krisztian Pinter <pin.terminator@gmail.com> | 2014-07-03 18:47:10 +0200 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2014-09-17 10:19:34 +0200 |
commit | e3fcf5591eb2ac28a96315fb089f5c88e0c6aa1f (patch) | |
tree | a222b9cf0839f156959f08d58c8468f5a7649726 /include/svx/SvxColorValueSet.hxx | |
parent | Add GIMP palette loading code (diff) | |
download | core-e3fcf5591eb2ac28a96315fb089f5c88e0c6aa1f.tar.gz core-e3fcf5591eb2ac28a96315fb089f5c88e0c6aa1f.zip |
Add PaletteManager, refactor palette code
Change-Id: I7e30fc895834318514b51bc648d32aa6d297bfae
Diffstat (limited to 'include/svx/SvxColorValueSet.hxx')
-rw-r--r-- | include/svx/SvxColorValueSet.hxx | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx index 77ad9b294ff6..7db9f4c38a6e 100644 --- a/include/svx/SvxColorValueSet.hxx +++ b/include/svx/SvxColorValueSet.hxx @@ -19,21 +19,12 @@ #ifndef INCLUDED_SVX_SVXCOLORVALUESET_HXX #define INCLUDED_SVX_SVXCOLORVALUESET_HXX +#include <svx/Palette.hxx> #include <svtools/valueset.hxx> #include <svx/svxdllapi.h> class XColorList; -struct Palette -{ - typedef std::pair<Color, OString> NamedColor; - typedef std::vector< NamedColor > ColorList; - Palette(){}; - Palette(const OUString &rFname); - OString maName; - ColorList maColors; -}; - class SVX_DLLPUBLIC SvxColorValueSet : public ValueSet { private: @@ -50,7 +41,7 @@ public: void addEntriesForXColorList(const XColorList& rXColorList, sal_uInt32 nStartIndex = 1); void loadColorVector(const std::vector<Color>& rColorVector, const OUString& rNamePrefix, sal_uInt32 nStartIndex = 1); - void loadPalette(const Palette& rPalette); + void loadPalette(Palette& rPalette); Size layoutAllVisible(sal_uInt32 nEntryCount); Size layoutToGivenHeight(sal_uInt32 nHeight, sal_uInt32 nEntryCount); }; |