svx/source/table/cell.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit 3fc7bae2533c2b80c917c477a28c1fd90e6ad7c1
Author: Matúš Kukan <matus.ku...@collabora.com>
Date: Tue Aug 26 10:16:34 2014 +0200
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.ti...@collabora.com>
Tested-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index 3ab9b68..4957c81 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);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
