commit 32efd4529aba776eca9456e96656d542267874f3
author Justin Luth <justin.luth@collabora.com> Wed Oct 30 11:11:45 2019 +0300
committer Justin Luth <justin_luth@sil.org> Thu Oct 31 04:32:49 2019 +0100
tree a3cff1e22725398b9475c2887112f07132c02090
parent 5d0bfad6c9e8200f90e02da749b71eff04a0794d

tdf#128447 sc/vml: accept <? ?> xml prolog

... or processing instruction, or text directive.

The inability to parse this was exposed in LO 6.2
with commit 2cae2ecfef47d8dd10647c10f9577392c1887d3a

I added <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
to the top of vmlDrawing1.vml from the unit test,
which invalidates the entire .vml file and the two
controls are lost without this fix.

Change-Id: Ia1e6d5f9bb932756f70dca59fa8b32004c9e8013
Reviewed-on: https://gerrit.libreoffice.org/81730
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins

oox/source/vml/vmlinputstream.cxx

diff --git a/oox/source/vml/vmlinputstream.cxx b/oox/source/vml/vmlinputstream.cxx
index 215eff3..2fc17ee 100644
--- a/oox/source/vml/vmlinputstream.cxx
+++ b/oox/source/vml/vmlinputstream.cxx
@@ -169,6 +169,12 @@ void lclProcessElement( OStringBuffer& rBuffer, const OString& rElement )
        // do nothing
    }

    // just append any xml prolog (text directive) or processing instructions: <?...?>
    else if( (nElementLen >= 4) && (pcOpen[ 1 ] == '?') && (pcClose[ -1 ] == '?') )
    {
        rBuffer.append( rElement );
    }

    // replace '<br>' element with newline
    else if( (nElementLen >= 4) && (pcOpen[ 1 ] == 'b') && (pcOpen[ 2 ] == 'r') && (lclFindNonWhiteSpace( pcOpen + 3, pcClose ) == pcClose) )
    {

sc/qa/unit/data/xlsx/tdf120301_xmlSpaceParsing.xlsx

diff --git a/sc/qa/unit/data/xlsx/tdf120301_xmlSpaceParsing.xlsx b/sc/qa/unit/data/xlsx/tdf120301_xmlSpaceParsing.xlsx
index 0677a0c..b28c4dd 100644
--- a/sc/qa/unit/data/xlsx/tdf120301_xmlSpaceParsing.xlsx
+++ b/sc/qa/unit/data/xlsx/tdf120301_xmlSpaceParsing.xlsx
Binary files differ