summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorAldo Román Nureña <aldo.roman.nurena@gmail.com>2012-04-08 23:39:12 -0500
committerMichael Stahl <mstahl@redhat.com>2012-04-10 13:42:39 +0200
commit37af4b002422f889ceecc21474a4b049f516b72e (patch)
tree4d2567097d9f4011ee9c4f70a70abe69afeec392 /sw
parent2dca19256f28b04aed07c63f10ba07c16ff81542 (diff)
fdo#35042: previous color applied instead of "no fill"
There was a missing line when last select highlight color was "no fill"
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/shells/textsh1.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx
index 1e8ef3999643..9cb232bd3b82 100644
--- a/sw/source/ui/shells/textsh1.cxx
+++ b/sw/source/ui/shells/textsh1.cxx
@@ -1120,15 +1120,17 @@ void SwTextShell::Execute(SfxRequest &rReq)
if(pItem)
{
aSet = ((const SvxColorItem*)pItem)->GetValue();
- rEdtWin.SetTextBackColor(aSet);
+ rEdtWin.SetTextBackColor(aSet); //select last color
}
+ else
+ rEdtWin.SetTextBackColor(Color(COL_TRANSPARENT)); //if last was "no fill"
if(!pApply && (rWrtSh.HasSelection() || rReq.IsAPI()))
{
SvxBrushItem aBrushItem(RES_CHRATR_BACKGROUND);
if(pItem)
- aBrushItem.SetColor(aSet);
+ aBrushItem.SetColor(aSet); //set the selected color
else
- aBrushItem.SetColor(Color(COL_TRANSPARENT));
+ aBrushItem.SetColor(Color(COL_TRANSPARENT));//set "no fill" color
rWrtSh.SetAttr( aBrushItem );
}
else if(!pApply || pApply->nColor != SID_ATTR_CHAR_COLOR_BACKGROUND_EXT)