[Libreoffice-commits] core.git: Change RGB "FFFF00" -> "ffff00" to keep roundtrip test happy

[Stephan Bergmann]

On 04/23/2014 10:54 PM, Stephan Bergmann wrote:
> commit 8485a276022e05bd34afb2321e72ecfad4589f7e
> Author: Stephan Bergmann <sbergman at redhat.com>
> Date:   Wed Apr 23 22:50:09 2014 +0200
>
>      Change RGB "FFFF00" -> "ffff00" to keep roundtrip test happy
>
>      Change-Id: I14e48d56b6f34be31a1580d448352b925f9aadde
>
> diff --git a/sw/qa/extras/ooxmlexport/data/shape-effect-preservation.docx b/sw/qa/extras/ooxmlexport/data/shape-effect-preservation.docx
> index 97787eb..35c7aba 100644
> Binary files a/sw/qa/extras/ooxmlexport/data/shape-effect-preservation.docx and b/sw/qa/extras/ooxmlexport/data/shape-effect-preservation.docx differ
> diff --git a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
> index 8a73e85..4995a9d 100644
> --- a/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
> +++ b/sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx
> @@ -1100,7 +1100,7 @@ DECLARE_OOXMLEXPORT_TEST(testShapeEffectPreservation, "shape-effect-preservation
>       /* FIXME why does this fail?
>       assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/"
>               "wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:effectLst/a:innerShdw/a:srgbClr",
> -            "val", "FFFF00");
> +            "val", "ffff00");
>       assertXPath(pXmlDoc, "/w:document/w:body/w:p[3]/w:r/mc:AlternateContent/mc:Choice/w:drawing/"
>               "wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:effectLst/a:innerShdw/a:srgbClr/a:alpha",
>               "val", "50000"); */

Would it be better to change 
oox::drawingml::DrawingML::WriteColor(sal_uInt32, sal_Int32) 
(oox/source/export/drawingml.cxx) to always write OOXML ST_HexColorRGB 
values in W3C XML Schema hexBinaryCanonical form, i.e., with upper case 
digits A--F?

(I refrained from doing that when I saw that it would break other tests 
that already expected the XML files to contain lower case digits, even 
though the MS-produced files appear to consistently use upper case digits.)

Stephan