diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-08-04 11:02:55 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-08-21 21:24:26 +0200 |
| commit | a646555d1b20c7cea82dab7db8f12bdbb7b4d721 (patch) | |
| tree | f6d1bbcb62842c2096603b9372927d3dab263459 /sw | |
| parent | d199a12b155d610b2ebd10a23e72be39722e4ca3 (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
(cherry picked from commit b5e60724ac73bb0e62b249145a8931fd6166bb69)
Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Change-Id: I94891769766ae90017e8afa70e65d080d5270202
Reviewed-on: https://gerrit.libreoffice.org/10721
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 389a16821039..37fb1b5bf712 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -1543,6 +1543,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo69636, "fdo69636.docx") CPPUNIT_ASSERT(getXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/w:pict/v:rect/v:textbox", "style").match("mso-layout-flow-alt:bottom-to-top")); } +/* DECLARE_OOXMLEXPORT_TEST(testCharHighlight, "char_highlight.docx") { const uno::Reference< text::XTextRange > xPara = getParagraph(1); @@ -1589,6 +1590,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") { |