[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source

[Matúš Kukan]

 svx/source/table/cell.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4eaa74690d2c35acc3668a2016a23c9d111e2d3f
Author: Matúš Kukan <matus.kukan at 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/11123
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/svx/source/table/cell.cxx b/svx/source/table/cell.cxx
index d4f199b..291da60 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);
                     }