diff options
| author | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-09-22 16:49:30 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2022-09-23 12:24:01 +0200 |
| commit | bdebe856d110700d757625f121879de920b9ef46 (patch) | |
| tree | b0ebb4755a7f6507d01e9a423889b488dc88cb43 /svgio/qa/cppunit | |
| parent | e47e0cb0ad1dc3554e9b57f8562a217cf785edbf (diff) | |
tdf#151118: svg: don't replace newline with space when xml:space="default"
Partially revert ddf695db44bcb23dc2f1459fd439f93c0b6d5f2a
"tdf#151118: svg: fix handling of xml:space="preserve""
See discussion in https://gerrit.libreoffice.org/c/core/+/140404
Thanks to Mike Kaganski for spotting it
Change-Id: Ifdd26b8de2f5cc392127f215e148599ae63036dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140444
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'svgio/qa/cppunit')
| -rw-r--r-- | svgio/qa/cppunit/SvgImportTest.cxx | 8 | ||||
| -rw-r--r-- | svgio/qa/cppunit/data/textXmlSpace.svg | 10 |
2 files changed, 12 insertions, 6 deletions
diff --git a/svgio/qa/cppunit/SvgImportTest.cxx b/svgio/qa/cppunit/SvgImportTest.cxx index 23734777cf2c..d2cc7bd90828 100644 --- a/svgio/qa/cppunit/SvgImportTest.cxx +++ b/svgio/qa/cppunit/SvgImportTest.cxx @@ -436,9 +436,11 @@ void Test::testTextXmlSpace() assertXPath(pDocument, "/primitive2D/transform/mask/textsimpleportion[1]", "text", "a b"); assertXPath(pDocument, "/primitive2D/transform/mask/textsimpleportion[2]", "text", "a b"); assertXPath(pDocument, "/primitive2D/transform/mask/textsimpleportion[3]", "text", "a b"); - assertXPath(pDocument, "/primitive2D/transform/mask/textsimpleportion[4]", "text", "a b"); - assertXPath(pDocument, "/primitive2D/transform/mask/textsimpleportion[5]", "text", "a b"); - assertXPath(pDocument, "/primitive2D/transform/mask/textsimpleportion[6]", "text", "a b"); + assertXPath(pDocument, "/primitive2D/transform/mask/textsimpleportion[4]", "text", "ab"); + assertXPath(pDocument, "/primitive2D/transform/mask/textsimpleportion[5]", "text", "a b"); + assertXPath(pDocument, "/primitive2D/transform/mask/textsimpleportion[6]", "text", "a b"); + assertXPath(pDocument, "/primitive2D/transform/mask/textsimpleportion[7]", "text", "a b"); + assertXPath(pDocument, "/primitive2D/transform/mask/textsimpleportion[8]", "text", "a b"); } void Test::testTdf45771() diff --git a/svgio/qa/cppunit/data/textXmlSpace.svg b/svgio/qa/cppunit/data/textXmlSpace.svg index 606e2eb7a306..f200d74dd3f3 100644 --- a/svgio/qa/cppunit/data/textXmlSpace.svg +++ b/svgio/qa/cppunit/data/textXmlSpace.svg @@ -4,9 +4,13 @@ <text y="30" xml:space="default">a b</text> <text y="50" xml:space="default">a b</text> - <text y="70" xml:space="preserve">a b</text> - <text y="90" xml:space="preserve">a b</text> - <text y="110" xml:space="preserve">a + <text y="70" xml:space="default">a +b</text> + <text y="90" xml:space="preserve">a b</text> + <text y="110" xml:space="preserve">a b</text> + <text y="130" xml:space="preserve">a b</text> + <text y="150" xml:space="preserve">a +b</text> </svg> |
