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 /sc | |
| 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 'sc')
| -rw-r--r-- | sc/inc/pch/precompiled_sc.hxx | 1 | ||||
| -rw-r--r-- | sc/source/ui/app/scdll.cxx | 9 | ||||
| -rw-r--r-- | sc/uiconfig/scalc/toolbar/extrusionobjectbar.xml | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index fec06222d76f..b1e0261b905b 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -715,7 +715,6 @@ #include <svx/drawitem.hxx> #include <svx/extedit.hxx> #include <svx/extrusionbar.hxx> -#include <svx/extrusioncolorcontrol.hxx> #include <svx/fillctrl.hxx> #include <svx/fmdpage.hxx> #include <svx/fmglob.hxx> diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 1a0cd616c873..d4cf75920965 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -34,7 +34,6 @@ #include <avmedia/mediaplayer.hxx> #include <avmedia/mediatoolbox.hxx> #include <comphelper/types.hxx> -#include <svx/extrusioncolorcontrol.hxx> #include <svx/fontworkgallery.hxx> #include <svx/tbxcustomshapes.hxx> @@ -188,11 +187,11 @@ void ScDLL::Init() SvxLineEndToolBoxControl ::RegisterControl(SID_ATTR_LINEEND_STYLE, pMod); SvxStyleToolBoxControl ::RegisterControl(SID_STYLE_APPLY, pMod); SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod); - SvxColorExtToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod); - SvxColorExtToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod); + SvxColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod); + SvxColorToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod); SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER, pMod); SvxFrameLineStyleToolBoxControl ::RegisterControl(SID_FRAME_LINESTYLE, pMod); - SvxColorExtToolBoxControl ::RegisterControl(SID_FRAME_LINECOLOR, pMod); + SvxColorToolBoxControl ::RegisterControl(SID_FRAME_LINECOLOR, pMod); SvxClipBoardControl ::RegisterControl(SID_PASTE, pMod ); SvxUndoRedoControl ::RegisterControl(SID_UNDO, pMod ); SvxUndoRedoControl ::RegisterControl(SID_REDO, pMod ); @@ -237,7 +236,7 @@ void ScDLL::Init() SvxFontSizeMenuControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod); // CustomShape extrusion controller - svx::ExtrusionColorControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod ); + SvxColorToolBoxControl::RegisterControl( SID_EXTRUSION_3D_COLOR, pMod ); svx::FontWorkShapeTypeControl::RegisterControl( SID_FONTWORK_SHAPE_TYPE, pMod ); // Child Windows diff --git a/sc/uiconfig/scalc/toolbar/extrusionobjectbar.xml b/sc/uiconfig/scalc/toolbar/extrusionobjectbar.xml index 017f89e5db50..09e65341e7ab 100644 --- a/sc/uiconfig/scalc/toolbar/extrusionobjectbar.xml +++ b/sc/uiconfig/scalc/toolbar/extrusionobjectbar.xml @@ -29,5 +29,5 @@ <toolbar:toolbaritem xlink:href=".uno:ExtrusionDirectionFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionLightingFloater" toolbar:style="dropdownonly"/> <toolbar:toolbaritem xlink:href=".uno:ExtrusionSurfaceFloater" toolbar:style="dropdownonly"/> - <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:style="dropdownonly"/> + <toolbar:toolbaritem xlink:href=".uno:Extrusion3DColor" toolbar:style="dropdown"/> </toolbar:toolbar>
\ No newline at end of file |