diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2014-05-11 02:21:23 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2014-05-14 12:39:42 +0300 |
| commit | 584b415924bba22db23a4258062e54973de0ed7c (patch) | |
| tree | 6c1ee8bbbca7f20c61193710a99a6d4399d26d90 /sd/source | |
| parent | 2a98a03904895b6dce7ec53042b0204dbb379d5b (diff) | |
Keep only one class for toolbox color controls
instead of 5 (mostly identical) classes.
Also the following bugs were fixed:
* All pickers now use split buttons. (fdo#45671)
* Color palette now indicates the current color. (fdo#73891)
(Previous changes related to that bug are reverted as part
of this commit.)
* Selecting a color from a float panel now updates the
button. (fdo#77683)
* For Font color/background color in Writer, the color
that is shown on the button, is always the one that's
actually used. (Can be a different color after hiding
the toolbar.)
* For Font color/background color in Writer, the button
now indicates when we're in the format paintbrush mode.
(Removed in 085e8a07e61ef2d3a82e11094d8773ab17cfdb3c
for some reason.)
Change-Id: Idb4829552240c52fb0882aca627c8177bbe2f839
Diffstat (limited to 'sd/source')
| -rw-r--r-- | sd/source/ui/app/sddll.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 26db281cb5e8..40dcb4a4eef6 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -65,7 +65,6 @@ #include <svx/svxids.hrc> #include <svx/bmpmask.hxx> #include <svx/clipboardctl.hxx> -#include <svx/extrusioncolorcontrol.hxx> #include <svx/f3dchild.hxx> #include <svx/fillctrl.hxx> #include <svx/fntctl.hxx> @@ -218,7 +217,7 @@ void SdDLL::RegisterControllers() SvxStyleToolBoxControl::RegisterControl(0, pMod); SvxFontNameToolBoxControl::RegisterControl(0, pMod); - SvxFontColorToolBoxControl::RegisterControl(0, pMod); + SvxColorToolBoxControl::RegisterControl(0, pMod); SvxGrafFilterToolBoxControl::RegisterControl( SID_GRFFILTER, pMod ); SvxGrafModeToolBoxControl::RegisterControl( SID_ATTR_GRAF_MODE, pMod ); @@ -262,7 +261,7 @@ void SdDLL::RegisterControllers() SvxClipBoardControl::RegisterControl( SID_PASTE, pMod ); SvxClipBoardControl::RegisterControl( SID_PASTE_UNFORMATTED, pMod ); - svx::ExtrusionColorControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod ); + SvxColorToolBoxControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod ); svx::FontWorkShapeTypeControl::RegisterControl( SID_FONTWORK_SHAPE_TYPE, pMod ); ::avmedia::MediaToolBoxControl::RegisterControl( SID_AVMEDIA_TOOLBOX, pMod ); @@ -270,7 +269,7 @@ void SdDLL::RegisterControllers() SdTemplateControl::RegisterControl( SID_STATUS_LAYOUT, pMod ); SvxTableToolBoxControl::RegisterControl(SID_INSERT_TABLE, pMod ); SvxFrameLineStyleToolBoxControl::RegisterControl(SID_FRAME_LINESTYLE, pMod ); - SvxFrameLineColorToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod ); + SvxColorToolBoxControl::RegisterControl(SID_FRAME_LINECOLOR, pMod ); SvxFrameToolBoxControl::RegisterControl(SID_ATTR_BORDER, pMod ); SvxSubToolBoxControl::RegisterControl(SID_OPTIMIZE_TABLE, pMod); } |