diff options
| author | Winfried Donkers <osc@dci-electronics.nl> | 2012-02-21 14:50:04 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-02-21 14:50:04 +0000 |
| commit | 836d98646203e0d9d3916571ed55d6572c2cb3dc (patch) | |
| tree | 2e7f4845b93bbc3f4fc05a4845f95ec03edf84df /svx/inc | |
| parent | 46cf18fdf137d68ff42d6e037a1285a37c65c07f (diff) | |
fdo#44611 writer: paragraph background color picker with split button
Diffstat (limited to 'svx/inc')
| -rw-r--r--[-rwxr-xr-x] | svx/inc/svx/svxids.hrc | 0 | ||||
| -rw-r--r-- | svx/inc/svx/tbcontrl.hxx | 29 |
2 files changed, 13 insertions, 16 deletions
diff --git a/svx/inc/svx/svxids.hrc b/svx/inc/svx/svxids.hrc index f66af83d2a3c..f66af83d2a3c 100755..100644 --- a/svx/inc/svx/svxids.hrc +++ b/svx/inc/svx/svxids.hrc diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx index e0f0bdd1a5a6..35806e5c707c 100644 --- a/svx/inc/svx/tbcontrl.hxx +++ b/svx/inc/svx/tbcontrl.hxx @@ -65,23 +65,23 @@ from DocShell: presently none in future: color palette - class SvxFontColorExtToolBoxControl + class SvxColorExtToolBoxControl ----------------------------------- - for font color Item type: SvxColorItem - und SfxBoolItem + and SfxBoolItem + + for font color (writer, ...) Execute-Id SID_ATTR_CHAR_COLOR2 - und SID_ATTR_CHAR_COLOR_EXT + and SID_ATTR_CHAR_COLOR_EXT for character background color (writer) - Item-Typ SvxColorItem - und SfxBoolItem Execute-Id SID_ATTR_CHAR_COLOR_BACKGROUND - und SID_ATTR_CHAR_COLOR_BACKGROUND_EXT + and SID_ATTR_CHAR_COLOR_BACKGROUND_EXT + + for paragraph background color (writer) + Execute-Id SID_BACKGROUND_COLOR for cell background color (calc) - Item-Typ SvxColorItem - und SfxBoolItem Execute-Id SID_ATTR_CHAR_COLOR_BACKGROUND SvxColorToolBoxControl @@ -89,9 +89,6 @@ Item type: SvxBrushItem Execute-Id: SID_BACKGROUND_COLOR -> SvxColorItem - Additional information - from DocShell: presently none - in future: color palette SvxPatternToolBoxControl ------------------------ @@ -306,12 +303,12 @@ public: //======================================================================== -// class SvxFontColorExtToolBoxControl -------------------------------------- +// class SvxColorExtToolBoxControl -------------------------------------- //======================================================================== -class SVX_DLLPUBLIC SvxFontColorExtToolBoxControl : public SfxToolBoxControl +class SVX_DLLPUBLIC SvxColorExtToolBoxControl : public SfxToolBoxControl { using SfxToolBoxControl::StateChanged; using SfxToolBoxControl::Select; @@ -323,8 +320,8 @@ class SVX_DLLPUBLIC SvxFontColorExtToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); - SvxFontColorExtToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxFontColorExtToolBoxControl(); + SvxColorExtToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); + ~SvxColorExtToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ); |