diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-03-18 10:19:25 +0100 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-03-21 16:19:07 +0100 |
| commit | 8f01925d98dabdbf400c9263e08242267b2b9701 (patch) | |
| tree | 2b206367a158063689719698d337a367cadbbb75 | |
| parent | 40d5a40639da68f0b74d96b6c9e0f30acb571f4b (diff) | |
Char highlight: enable DOCX import
Disabled by:
b5e60724ac73bb0e62b249145a8931fd6166bb69
Change-Id: Ifde33d53198306eac845db6c269d337fa051f6ab
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport3.cxx | 4 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx index b5e3ff47691a..0036db92f1ff 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport3.cxx @@ -469,7 +469,7 @@ DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx") CPPUNIT_ASSERT_EQUAL(OUString("RenderedShapes"), nValue); // Rendered bitmap has the proper name } -/* + DECLARE_OOXMLEXPORT_TEST(testCharHighlight, "char_highlight.docx") { const uno::Reference< text::XTextRange > xPara = getParagraph(1); @@ -516,7 +516,7 @@ DECLARE_OOXMLEXPORT_TEST(testCharHighlight, "char_highlight.docx") CPPUNIT_ASSERT_EQUAL(sal_Int32(0x0000ff), getProperty<sal_Int32>(xRun,"CharBackColor")); } } -*/ + DECLARE_OOXMLEXPORT_TEST(testFontNameIsEmpty, "font-name-is-empty.docx") { diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index de167850a28f..5ee0239ece12 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -1414,7 +1414,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, PropertyMapPtr rContext ) { sal_Int32 nColor = 0; if( (mbIsHighlightSet = getColorFromId(nIntValue, nColor)) ) - rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( nColor )); + rContext->Insert(PROP_CHAR_HIGHLIGHT, uno::makeAny( nColor )); else if (mnBackgroundColor) rContext->Insert(PROP_CHAR_BACK_COLOR, uno::makeAny( mnBackgroundColor )); else |