[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerfilter/source

[Cédric Bosdonnat]

 writerfilter/source/dmapper/StyleSheetTable.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 2e2679cb0b79acb81028fa75518ffa1bb368d403
Author: Cédric Bosdonnat <cedric.bosdonnat at free.fr>
Date:   Mon Jun 17 13:42:34 2013 +0200

    n#820504: default color hidden by Default style in writerfilter
    
    Setting the font color of the default paragraph style to Auto makes the
    color set in the Writer defaults (from rPrDefault) ignored.
    
    Change-Id: I1dcd92bcd0774f5229785373242899a492ab7b7c
    (cherry picked from commit d7acb5ba0924f848f1ae96eceab50a0169d18445)
    Reviewed-on: https://gerrit.libreoffice.org/4534
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index cf2ae05..325c9a4 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -774,8 +774,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
                         pEntry->pProperties->Insert(PROP_PARA_ORPHANS, true, aTwo, false);
     //                  Left-to-right direction if not already set
                         pEntry->pProperties->Insert(PROP_WRITING_MODE, true, uno::makeAny( sal_Int16(text::WritingMode_LR_TB) ), false);
-    //                  font color COL_AUTO if not already set
-                        pEntry->pProperties->Insert(PROP_CHAR_COLOR, true, uno::makeAny( sal_Int32(0xffffffff) ), false);
+                        // Don't set font color to Auto if not already set: this could hide the default font color setting
                     }
 
                     uno::Sequence< beans::PropertyValue > aPropValues = pEntry->pProperties->GetPropertyValues();