diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2014-05-11 01:53:30 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2014-05-14 12:39:41 +0300 |
| commit | b07377b3effd8b64054f923be99cde65e663f025 (patch) | |
| tree | 33e9deb821c2687702ecad5b67bb43148cf18e61 /include | |
| parent | fb33f0d898d371401a0efeba04713cd73efe2836 (diff) | |
Revert "fdo#77683 the color in the toolbar buttons doesn't change."
This reverts commit f5dc536eae7dc28e09112ab9dd69e55fae015ee8.
This commit actually created a regression. A split button supposed
to show the last used color, not the current one.
I'll try to solve fdo#77683 in a different way, in a following commit.
Change-Id: I5df1ce49995e4755f54af977ca25d4e4dfdee629
Diffstat (limited to 'include')
| -rw-r--r-- | include/svx/tbcontrl.hxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 22c1c5ecf432..94868eaae8a3 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -269,6 +269,7 @@ class SVX_DLLPUBLIC SvxColorExtToolBoxControl : public SfxToolBoxControl ::svx::ToolboxButtonColorUpdater* pBtnUpdater; Color mLastColor; + bool bChoiceFromPalette; public: SFX_DECL_TOOLBOX_CONTROL(); |