diff options
| author | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-07-14 09:44:10 +0200 |
|---|---|---|
| committer | Zolnai Tamás <zolnaitamas2000@gmail.com> | 2015-07-14 10:36:18 +0200 |
| commit | 16f9cf57e20ffbe34cb184f694f465708250a578 (patch) | |
| tree | 951f0cc53f96103e5f365ef5bc4a04655800d1e5 /sw/qa/extras/globalfilter | |
| parent | 70f152983f3425a77df2f65b4798417640d47b76 (diff) | |
tdf#92471: Improve color conversion to MSO highlighting
The simple color distance on RGB color space is not good enough.
It leads to a better result if we use the scheme of the primary
colors.
This method works well with MSO highlighting color palette, but
not neccessarily in general. In highlighting palette light and
dark variant of the same color type (e.g. blue and light blue) has
the exactly same scheme.
Change-Id: Ied08b4c388b8020326709d01d2de290afdd9d77b
Diffstat (limited to 'sw/qa/extras/globalfilter')
| -rw-r--r-- | sw/qa/extras/globalfilter/globalfilter.cxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx b/sw/qa/extras/globalfilter/globalfilter.cxx index a67a3cbf0080..a33329a8e890 100644 --- a/sw/qa/extras/globalfilter/globalfilter.cxx +++ b/sw/qa/extras/globalfilter/globalfilter.cxx @@ -606,7 +606,7 @@ void Test::testCharBackgroundToHighlighting() mxComponent = loadFromDesktop(getURLFromSrc("/sw/qa/extras/globalfilter/data/char_background.odt"), "com.sun.star.text.TextDocument"); - const OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter]; + OString sFailedMessage = OString("Failed on filter: ") + aFilterNames[nFilter]; SvtFilterOptions& rOpt = SvtFilterOptions::Get(); @@ -627,7 +627,7 @@ void Test::testCharBackgroundToHighlighting() // Check highlight color const uno::Reference< text::XTextRange > xPara = getParagraph(1); - for( int nRun = 1; nRun <= 20; ++nRun ) + for( int nRun = 1; nRun <= 19; ++nRun ) { const uno::Reference<beans::XPropertySet> xRun(getRun(xPara,nRun), uno::UNO_QUERY); sal_Int32 nHighlightColor = 0; @@ -644,17 +644,17 @@ void Test::testCharBackgroundToHighlighting() case 9: nHighlightColor = 0x008000; break; //dark green case 10: nHighlightColor = 0x800080; break; //dark magenta case 11: nHighlightColor = 0x000080; break; //dark blue - case 12: nHighlightColor = 0x000000; break; //black - case 13: nHighlightColor = 0x808000; break; //dark yellow - case 14: nHighlightColor = 0x808080; break; //dark gray - case 15: nHighlightColor = 0x000000; break; //white - case 16: nHighlightColor = 0xff0000; break; //red - case 17: nHighlightColor = 0xC0C0C0; break; //light gray - case 18: nHighlightColor = 0x800000; break; //dark red - case 19: nHighlightColor = 0x008080; break; //dark cyan - case 20: nHighlightColor = 0xffffff; break; //white + case 12: nHighlightColor = 0x808000; break; //dark yellow + case 13: nHighlightColor = 0x808080; break; //dark gray + case 14: nHighlightColor = 0x000000; break; //black + case 15: nHighlightColor = 0xff0000; break; //red + case 16: nHighlightColor = 0xC0C0C0; break; //light gray + case 17: nHighlightColor = 0x800000; break; //dark red + case 18: nHighlightColor = 0x808080; break; //dark gray + case 19: nHighlightColor = 0xffff00; break; //yellow } - CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), nHighlightColor, getProperty<sal_Int32>(xRun,"CharHighlight")); + const OString sMessage = sFailedMessage +". Index of run with unmatched color: " + OString::number(nRun); + CPPUNIT_ASSERT_EQUAL_MESSAGE(sMessage.getStr(), nHighlightColor, getProperty<sal_Int32>(xRun,"CharHighlight")); } } } |