[Libreoffice-commits] core.git: sw/qa writerfilter/source

[Zolnai Tamás]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx     |    2 ++
 writerfilter/source/dmapper/DomainMapper.cxx |    2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b5e60724ac73bb0e62b249145a8931fd6166bb69
Author: Zolnai Tamás <tamas.zol...@collabora.com>
Date:   Sun Aug 3 10:45:23 2014 +0200

    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

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 207ad5b..62195cc 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1482,6 +1482,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);
@@ -1528,6 +1529,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 bd0b370..e719ef1 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1367,7 +1367,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 ));
             else

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits