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/inc | |
| 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/inc')
| -rw-r--r-- | svgio/inc/svgdocumenthandler.hxx | 2 | ||||
| -rw-r--r-- | svgio/inc/svgtoken.hxx | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/svgio/inc/svgdocumenthandler.hxx b/svgio/inc/svgdocumenthandler.hxx index a13284340a38..8511a0adfbcc 100644 --- a/svgio/inc/svgdocumenthandler.hxx +++ b/svgio/inc/svgdocumenthandler.hxx @@ -40,8 +40,6 @@ namespace svgio::svgreader // text collector string stack for css styles std::vector< OUString > maCssContents; - bool bSkip; - public: SvgDocHdl(const OUString& rAbsolutePath); virtual ~SvgDocHdl() override; diff --git a/svgio/inc/svgtoken.hxx b/svgio/inc/svgtoken.hxx index 175297fa67e5..6c1a17692f22 100644 --- a/svgio/inc/svgtoken.hxx +++ b/svgio/inc/svgtoken.hxx @@ -188,9 +188,7 @@ namespace svgio::svgreader // text tokens Text, - BaselineShift, - - FlowRoot + BaselineShift }; SVGToken StrToSVGToken(const OUString& rStr, bool bCaseIndependent); |