summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat@free.fr>2013-06-17 13:42:34 +0200
committerCédric Bosdonnat <cedric.bosdonnat@free.fr>2013-06-19 10:55:14 +0200
commit8405e34a4f2b2c59469db4663219531b56cb6a37 (patch)
tree2370694aea498301ece855c3ffb4f4fe5ea122d1
parentab643cf17c5b7d24564cb02b326c61cc32f00fc5 (diff)
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)
-rw-r--r--writerfilter/source/dmapper/StyleSheetTable.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index c35c3e83a50c..8ddbeec2e18e 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -780,8 +780,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();