summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-08-26 10:16:34 +0200
committerAndras Timar <andras.timar@collabora.com>2014-08-26 05:38:05 -0500
commit4eaa74690d2c35acc3668a2016a23c9d111e2d3f (patch)
treefc6053d0c3bca43f6452d404958a2cedb94d11ef /svx
parent352a728ffbe171ea6f9f8e93e143fa24198d8271 (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/11123 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.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index d4f199bf07e6..291da60101ea 100644
--- a/svx/source/table/cell.cxx
+++ b/svx/source/table/cell.cxx
@@ -264,6 +264,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);
}