summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-10-14 23:31:16 +0200
committerMichael Stahl <mstahl@redhat.com>2016-10-14 23:49:29 +0200
commitb5b57c677fd7fe9b2594e428c556862df88fca9d (patch)
treee4d41ae84c553f8ddc4e20a7b329fb84d7053b29 /xmloff
parentdf84fdc645462e070b0227909f95716592885bde (diff)
tdf#64038 ODF import: fix handling of space following <text:s>
The whitespace collapse algorithm given in ODF 1.2 part 1, "6.1.2 White Space Characters", was not implemented as well as it could be. Although the problematic case is arguably invalid, because "6.1.3 <text:s>" says: This element shall be used to represent the second and all following “ “ (U+0020, SPACE) characters in a sequence of “ “ (U+0020, SPACE) characters. Hence it is probably irrelevant in practice that a space following <text:s> was ignored, because a conforming document cannot have such content. Change-Id: Ic30347fff27176c511ea317d46a1011b410e57d5
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/text/txtparai.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/xmloff/source/text/txtparai.cxx b/xmloff/source/text/txtparai.cxx
index 1d32d26e42d1..578c39ad18aa 100644
--- a/xmloff/source/text/txtparai.cxx
+++ b/xmloff/source/text/txtparai.cxx
@@ -1585,6 +1585,7 @@ SvXMLImportContext *XMLImpSpanContext_Impl::CreateChildContext(
pContext = new XMLCharContext( rImport, nPrefix,
rLocalName, xAttrList,
0x0020, true );
+ rIgnoreLeadingSpace = false;
break;
case XML_TOK_TEXT_HYPERLINK: