diff options
| author | Matúš Kukan <matus.kukan@collabora.com> | 2014-08-26 10:16:34 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@collabora.com> | 2014-08-26 10:45:01 +0200 |
| commit | a217f3cb2dce71a4322f78ceb45edb6f171b2b65 (patch) | |
| tree | 8b56224098cd5b41c607c9eb71a4c0db4c14a17b | |
| parent | fde9961034e954f39a6c221b714813557eb63040 (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
| -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 cf182d314d7f..fbc353b477d8 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); } |