diff options
| author | Krisztian Pinter <pin.terminator@gmail.com> | 2014-07-08 19:08:38 +0200 |
|---|---|---|
| committer | Tomaž Vajngerl <tomaz.vajngerl@collabora.co.uk> | 2014-09-17 10:19:37 +0200 |
| commit | ff17738a4a84ca53782d87da5f63d87a165d19d1 (patch) | |
| tree | dff794a8637879ce047bdfe3f23951b6ef5e6559 /include | |
| parent | 9ab1a4a0306c81c282225f1ddcb5a1c4678e9311 (diff) | |
Add color picker to color palette
Change-Id: I651f485598ee57af815780e234031f101b63fa24
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/PaletteManager.hxx | 7 | ||||
| -rw-r--r-- | include/svx/tbcontrl.hxx | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx index a6b2dfa79317..e1d720153e38 100644 --- a/include/svx/PaletteManager.hxx +++ b/include/svx/PaletteManager.hxx @@ -21,6 +21,7 @@ #include <svx/SvxColorValueSet.hxx> #include <rtl/ustring.hxx> +#include <svx/tbxcolorupdate.hxx> class PaletteManager { @@ -28,7 +29,9 @@ class PaletteManager sal_uInt16 mnCurrentPalette; long mnColorCount; + svx::ToolboxButtonColorUpdater* mpBtnUpdater; + Color mLastColor; std::vector<Palette> maPalettes; public: PaletteManager(); @@ -38,6 +41,10 @@ public: void NextPalette(); long GetColorCount(); OUString GetPaletteName(); + const Color& GetLastColor(); + void SetLastColor(const Color& rLastColor); + void SetBtnUpdater(svx::ToolboxButtonColorUpdater* pBtnUpdater); + void PopupColorPicker(); }; #endif // INCLUDED_SVX_PALETTEMANAGER_HXX diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 1e9c4b1e5a23..762f33d2ef7c 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -221,7 +221,6 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl using SfxToolBoxControl::StateChanged; ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > pBtnUpdater; - Color mLastColor; PaletteManager mPaletteManager; DECL_LINK( SelectedHdl, Color* ); public: @@ -242,7 +241,6 @@ public: class SVX_DLLPUBLIC SvxLineColorToolBoxControl : public SfxToolBoxControl { ::boost::scoped_ptr< ::svx::ToolboxButtonColorUpdater > pBtnUpdater; - Color mLastColor; PaletteManager mPaletteManager; DECL_LINK( SelectedHdl, Color* ); public: |