diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-08-26 10:16:34 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-08-26 05:37:39 -0500 |
| commit | 3fc7bae2533c2b80c917c477a28c1fd90e6ad7c1 (patch) | |
| tree | 1cc5ac9fa5a00c9aba4e10326e1d1e2ef439d1d5 /svx | |
| parent | f83c7358964cf9f265f21e7dfa72e82a26923b3e (diff) | |
bnc#770711: Make changing table text color in impress always work
We set text color for individual characters (in ContentNode::aCharAttribList)
and for whole paragraph (in ContentNode::aContentAttribs) too.
Problem: when table was loaded in an impress document with font color set,
you could not change it by selecting a cell because only
ContentNode::aContentAttribs was set, which has lower priority.
So, in that case, remove font color character attributes.
Change-Id: Ieb0c078481568dcb1739fe35d448c9591f687f2c
(cherry picked from commit a217f3cb2dce71a4322f78ceb45edb6f171b2b65)
Reviewed-on: https://gerrit.libreoffice.org/11122
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/table/cell.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx index 3ab9b683006f..4957c81c4809 100644 --- a/svx/source/table/cell.cxx +++ b/svx/source/table/cell.cxx @@ -265,6 +265,8 @@ namespace sdr { SfxItemSet aSet(pOutliner->GetParaAttribs(nPara)); aSet.Put(rSet); + if (aSet.GetItemState(EE_CHAR_COLOR, false) == SFX_ITEM_ON) + pOutliner->QuickRemoveCharAttribs( nPara, EE_CHAR_COLOR ); pOutliner->SetParaAttribs(nPara, aSet); } |