diff options
author | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-08-03 18:55:50 +0200 |
---|---|---|
committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2023-08-03 22:48:03 +0200 |
commit | 2f17ce9ac89c1ad380bde39036000a1979f567bb (patch) | |
tree | 8b3cb32d34e1b9e78aaf9b6f5f62064eeb9647a1 /svgio/source/svgreader/svgtoken.cxx | |
parent | e222f60ac2a71032dbdf62d7c7e28978b5a0b19c (diff) |
Revert "fdo#50114 ingore flowRoot element during svg import"
This commit reverts 5bd241b99b76ae7f4b3c1d4f2bcbaf7c487bb339
which is no longer needed after
13a41e7a12598c7896d6dc8d34aba6af5b80b83c
"tdf#150124: do nothing when parent is of unkown type"
and might cause unexpected results as seen with
https://bugs.documentfoundation.org/attachment.cgi?id=124782
from https://bugs.documentfoundation.org/show_bug.cgi?id=99628
Change-Id: I8bb700f5c5553700f91b937330bc3730e8ea84c5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155320
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
Diffstat (limited to 'svgio/source/svgreader/svgtoken.cxx')
-rw-r--r-- | svgio/source/svgreader/svgtoken.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/svgio/source/svgreader/svgtoken.cxx b/svgio/source/svgreader/svgtoken.cxx index 24e24a5a31f7..961c4ec3b5a4 100644 --- a/svgio/source/svgreader/svgtoken.cxx +++ b/svgio/source/svgreader/svgtoken.cxx @@ -177,8 +177,7 @@ constexpr auto aSVGTokenMapperList = frozen::make_unordered_map<std::u16string_v { u"stroke-width", SVGToken::StrokeWidth }, { u"text", SVGToken::Text }, - { u"baseline-shift", SVGToken::BaselineShift }, - { u"flowRoot", SVGToken::FlowRoot } + { u"baseline-shift", SVGToken::BaselineShift } }); // The same elements as the map above but lowercase. CSS is case insensitive @@ -335,8 +334,7 @@ constexpr auto aSVGLowerCaseTokenMapperList = frozen::make_unordered_map<std::u { u"stroke-width", SVGToken::StrokeWidth }, { u"text", SVGToken::Text }, - { u"baseline-shift", SVGToken::BaselineShift }, - { u"flowroot", SVGToken::FlowRoot } + { u"baseline-shift", SVGToken::BaselineShift } }); static_assert(sizeof(aSVGTokenMapperList) == sizeof(aSVGLowerCaseTokenMapperList), |