summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorZolnai Tamás <tamas.zolnai@collabora.com>2014-08-03 10:45:23 +0200
committerMichael Stahl <mstahl@redhat.com>2014-08-04 11:21:08 +0000
commite9297597088f36d4072515fd46d1299381dcfe6b (patch)
tree089d37b1fedeb400ed1d62f88836d690921a4158 /writerfilter
parent6d9fc845f7b08977e3711b1dbe20ee44e62c3b3d (diff)
fdo#80986: disable highlight DOCX import
Highlight support is not implemented fully, so it seems better to disable DOCX import of it until it is finished. Highlight can't be modified on the UI and is not saved to ODT/DOC (regression). Regression from: 8b949134441056a1455d67ddfdd7e0bc5f2ee682 Change-Id: I94891769766ae90017e8afa70e65d080d5270202 (cherry picked from commit b5e60724ac73bb0e62b249145a8931fd6166bb69) Reviewed-on: https://gerrit.libreoffice.org/10722 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/dmapper/DomainMapper.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index 215bbaf46389..35ad80e921e2 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1333,7 +1333,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext )
{
sal_Int32 nColor = 0;
if( (mbIsHighlightSet = getColorFromIndex(nIntValue, nColor)) )
- rContext->Insert(PROP_CHAR_HIGHLIGHT, uno::makeAny( nColor ));
+ rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( nColor ));
else if (mnBackgroundColor)
rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( mnBackgroundColor ));
}