diff options
author | Krisztian Pinter <pin.terminator@gmail.com> | 2014-07-10 16:14:29 +0200 |
---|---|---|
committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2014-09-17 10:19:38 +0200 |
commit | ecbbf4c7cf26d4d38e3be10ec99eb941f6f7a16d (patch) | |
tree | 0c535566e5ae14ecbd7a44492fa59912ece3322f /include/svx/Palette.hxx | |
parent | Reduce ColorValueSetMaximumRowCount to 20 from 40 (diff) | |
download | core-ecbbf4c7cf26d4d38e3be10ec99eb941f6f7a16d.tar.gz core-ecbbf4c7cf26d4d38e3be10ec99eb941f6f7a16d.zip |
Change SvxColorWindow_Impl to use ComboBox for palette selection
Change-Id: I0fb9b46298f45bbdf9ae9198c145b9ea5e403bbf
Diffstat (limited to 'include/svx/Palette.hxx')
-rw-r--r-- | include/svx/Palette.hxx | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx index f7ced038c3e6..d31e9580b792 100644 --- a/include/svx/Palette.hxx +++ b/include/svx/Palette.hxx @@ -21,6 +21,7 @@ #include <rtl/ustring.hxx> #include <tools/color.hxx> +#include <tools/stream.hxx> class Palette { @@ -28,17 +29,23 @@ public: typedef std::pair<Color, OString> NamedColor; typedef std::vector< NamedColor > ColorList; private: - bool mbLoaded; - OUString maFname; - OString maName; + bool mbLoadedPalette; + bool mbValidPalette; + OUString maFName; + OUString maFPath; + OUString maName; ColorList maColors; - void LoadPalette(); + bool ReadPaletteHeader(SvFileStream& rFileStream); + void LoadPaletteHeader(); + void LoadPalette(); public: - Palette(const OUString &rFname); + Palette( const OUString &rFPath, const OUString &rFName ); - const OString& GetPaletteName(); + const OUString& GetName(); const ColorList& GetPaletteColors(); + + bool IsValid(); }; #endif // INCLUDED_SVX_PALETTE_HXX |