diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/Palette.hxx | 1 | ||||
| -rw-r--r-- | include/svx/PaletteManager.hxx | 17 |
2 files changed, 13 insertions, 5 deletions
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx index 11a34623ca51..6eab3f46bed2 100644 --- a/include/svx/Palette.hxx +++ b/include/svx/Palette.hxx @@ -29,7 +29,6 @@ typedef std::pair<Color, OUString> NamedColor; typedef std::vector< NamedColor > ColorList; - class Palette { public: diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx index e4144f96ca9c..cb70d2c4917d 100644 --- a/include/svx/PaletteManager.hxx +++ b/include/svx/PaletteManager.hxx @@ -23,6 +23,7 @@ #include <svx/Palette.hxx> #include <rtl/ustring.hxx> #include <svx/tbxcolorupdate.hxx> +#include <deque> #include <tools/urlobj.hxx> #include <comphelper/processfactory.hxx> @@ -36,27 +37,35 @@ class PaletteManager { - sal_uInt16 mnNumOfPalettes; - sal_uInt16 mnCurrentPalette; + const sal_uInt16 mnMaxRecentColors; - long mnColorCount; + sal_uInt16 mnNumOfPalettes; + sal_uInt16 mnCurrentPalette; + + long mnColorCount; svx::ToolboxButtonColorUpdater* mpBtnUpdater; - Color mLastColor; + Color mLastColor; + std::deque<Color> maRecentColors; boost::ptr_vector<Palette> maPalettes; public: PaletteManager(); ~PaletteManager(); void LoadPalettes(); void ReloadColorSet(SvxColorValueSet& rColorSet); + void ReloadRecentColorSet(SvxColorValueSet& rColorSet); std::vector<OUString> GetPaletteList(); void SetPalette( sal_Int32 nPos ); sal_Int32 GetPalette(); long GetColorCount(); + long GetRecentColorCount(); OUString GetPaletteName(); + const Color& GetLastColor(); void SetLastColor(const Color& rLastColor); + void AddRecentColor(const Color& rRecentColor); + void SetBtnUpdater(svx::ToolboxButtonColorUpdater* pBtnUpdater); void PopupColorPicker(const OUString aCommand); static void DispatchColorCommand(const OUString aCommand, const Color aColor); |