diff options
| author | Rishabh Kumar <kris.kr296@gmail.com> | 2016-07-24 17:23:40 +0530 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2016-07-25 09:22:12 +0000 |
| commit | db8ee318293da8967a8294dc558ffae898ba8e6b (patch) | |
| tree | ffec9bb5b79aaebabc6c1e0ef02bf89806481aa8 /include | |
| parent | 57c8915376dbb580760486071cac6533e05427bf (diff) | |
[GSoC] Fix palette selection in sidebar/toolbar color widget
Remember palette selection after the popup is destroyed
Change-Id: Iecd7fd4aa89cf9d2d6842c5b544d037df6818aaf
Reviewed-on: https://gerrit.libreoffice.org/27474
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/Palette.hxx | 4 | ||||
| -rw-r--r-- | include/svx/PaletteManager.hxx | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx index fa2c1798ff1e..1cbb83e2c94a 100644 --- a/include/svx/Palette.hxx +++ b/include/svx/Palette.hxx @@ -35,6 +35,7 @@ public: virtual ~Palette(); virtual const OUString& GetName() = 0; + virtual const OUString& GetPath() = 0; virtual void LoadColorSet( SvxColorValueSet& rColorSet ) = 0; virtual bool IsValid() = 0; @@ -55,6 +56,7 @@ public: virtual ~PaletteASE(); virtual const OUString& GetName() override; + virtual const OUString& GetPath() override; virtual void LoadColorSet( SvxColorValueSet& rColorSet ) override; virtual bool IsValid() override; @@ -79,6 +81,7 @@ public: virtual ~PaletteGPL(); virtual const OUString& GetName() override; + virtual const OUString& GetPath() override; virtual void LoadColorSet( SvxColorValueSet& rColorSet ) override; virtual bool IsValid() override; @@ -97,6 +100,7 @@ public: virtual ~PaletteSOC(); virtual const OUString& GetName() override; + virtual const OUString& GetPath() override; virtual void LoadColorSet( SvxColorValueSet& rColorSet ) override; virtual bool IsValid() override; diff --git a/include/svx/PaletteManager.hxx b/include/svx/PaletteManager.hxx index 2d4c528a1984..09adc3653a92 100644 --- a/include/svx/PaletteManager.hxx +++ b/include/svx/PaletteManager.hxx @@ -46,6 +46,7 @@ class PaletteManager long mnColorCount; svx::ToolboxButtonColorUpdater* mpBtnUpdater; + XColorListRef pColorList; Color mLastColor; std::deque<Color> maRecentColors; std::vector<std::unique_ptr<Palette>> m_Palettes; @@ -61,6 +62,7 @@ public: std::vector<OUString> GetPaletteList(); void SetPalette( sal_Int32 nPos ); sal_Int32 GetPalette(); + OUString GetPaletteName(); long GetColorCount(); long GetRecentColorCount(); |