summaryrefslogtreecommitdiff
path: root/svx/source/tbxctrls/colorwindow.hxx
diff options
context:
space:
mode:
authorKurosawa Takeshi <taken.spc@gmail.com>2011-02-25 15:45:22 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-02-25 15:45:22 +0000
commit574b67398c4333fedd5b46582a6f7c6867030456 (patch)
treec9812ee0d4f428948fc2b03d4a2f74a020ee5039 /svx/source/tbxctrls/colorwindow.hxx
parentf4340a7237f9869ad498faedb36739cdf4280344 (diff)
Resolves fdo#32376 Set default color to the current one in toolbar popup
Diffstat (limited to 'svx/source/tbxctrls/colorwindow.hxx')
-rw-r--r--svx/source/tbxctrls/colorwindow.hxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/svx/source/tbxctrls/colorwindow.hxx b/svx/source/tbxctrls/colorwindow.hxx
index 4596d350cee4..13919797d102 100644
--- a/svx/source/tbxctrls/colorwindow.hxx
+++ b/svx/source/tbxctrls/colorwindow.hxx
@@ -19,9 +19,10 @@ class SvxColorWindow_Impl : public SfxPopupWindow
using FloatingWindow::StateChanged;
private:
- const USHORT theSlotId;
- ValueSet aColorSet;
- rtl::OUString maCommand;
+ const USHORT theSlotId;
+ ValueSet aColorSet;
+ rtl::OUString maCommand;
+ const Color mLastColor;
#if _SOLAR__PRIVATE
DECL_LINK( SelectHdl, void * );
@@ -36,7 +37,8 @@ public:
USHORT nSlotId,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
const String& rWndTitle,
- Window* pParentWindow );
+ Window* pParentWindow,
+ const Color rLastColor = COL_AUTO);
~SvxColorWindow_Impl();
void StartSelection();