summaryrefslogtreecommitdiffstats
path: root/sc
diff options
context:
space:
mode:
authorWinfried Donkers <osc@dci-electronics.nl>2012-02-21 14:50:04 +0000
committerMichael Meeks <michael.meeks@suse.com>2012-02-21 14:50:04 +0000
commit836d98646203e0d9d3916571ed55d6572c2cb3dc (patch)
tree2e7f4845b93bbc3f4fc05a4845f95ec03edf84df /sc
parentcatch by reference (diff)
downloadcore-836d98646203e0d9d3916571ed55d6572c2cb3dc.tar.gz
core-836d98646203e0d9d3916571ed55d6572c2cb3dc.zip
fdo#44611 writer: paragraph background color picker with split button
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/app/scdll.cxx2
-rw-r--r--sc/source/ui/view/formatsh.cxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx
index 4675a2e3a891..cb98122dc903 100644
--- a/sc/source/ui/app/scdll.cxx
+++ b/sc/source/ui/app/scdll.cxx
@@ -204,7 +204,7 @@ void ScDLL::Init()
SvxFontNameToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONT, pMod);
// SvxFontHeightToolBoxControl ::RegisterControl(SID_ATTR_CHAR_FONTHEIGHT, pMod);
SvxFontColorToolBoxControl ::RegisterControl(SID_ATTR_CHAR_COLOR, pMod);
- SvxFontColorExtToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod);
+ SvxColorExtToolBoxControl ::RegisterControl(SID_BACKGROUND_COLOR, pMod);
SvxFrameToolBoxControl ::RegisterControl(SID_ATTR_BORDER, pMod);
SvxFrameLineStyleToolBoxControl ::RegisterControl(SID_FRAME_LINESTYLE, pMod);
SvxFrameLineColorToolBoxControl ::RegisterControl(SID_FRAME_LINECOLOR, pMod);
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index bbb44aedaab8..8a91f36ed35a 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -1453,10 +1453,10 @@ void ScFormatShell::ExecuteAttr( SfxRequest& rReq )
case SID_BACKGROUND_COLOR:
{
// SID_BACKGROUND_COLOR without arguments -> set background to last used color
+
SvxBrushItem aBrushItem( (const SvxBrushItem&)
pTabViewShell->GetSelectionPattern()->
GetItem( ATTR_BACKGROUND ) );
-
aBrushItem.SetColor( pTabViewShell->GetBackgroundColor() );
pTabViewShell->ApplyAttr( aBrushItem );