svgio/inc/svgfefloodnode.hxx | 1 -
svgio/inc/svgfeimagenode.hxx | 1 -
svgio/source/svgreader/svgfefloodnode.cxx | 11 -----------
svgio/source/svgreader/svgfeimagenode.cxx | 11 -----------
4 files changed, 24 deletions(-)
New commits:
commit ae5e743f90fbb4e7016d6d9f4c22bce971a5f5cb
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Sun Apr 21 19:04:08 2024 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Sun Apr 21 22:34:44 2024 +0200
svgio: feImage and feFlood don't support the in attribute
Added by mistake in b22039cff8380b158307e75762bd3e4ca045d77b
"related: tdf#159947: only parse in/result if the element supports them"
See https://developer.mozilla.org/en-US/docs/Web/SVG/Attribute/in
Change-Id: Ie8b5591349eff710d1edc7f413790ac9d31df99d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166389
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/svgio/inc/svgfefloodnode.hxx b/svgio/inc/svgfefloodnode.hxx
index 8aba2c3b0340..39e5cb6b1890 100644
--- a/svgio/inc/svgfefloodnode.hxx
+++ b/svgio/inc/svgfefloodnode.hxx
@@ -27,7 +27,6 @@ namespace svgio::svgreader
class SvgFeFloodNode final : public SvgFilterNode
{
private:
- OUString maIn;
OUString maResult;
SvgNumber maX;
SvgNumber maY;
diff --git a/svgio/inc/svgfeimagenode.hxx b/svgio/inc/svgfeimagenode.hxx
index ab303fdc92fe..743568fa65ce 100644
--- a/svgio/inc/svgfeimagenode.hxx
+++ b/svgio/inc/svgfeimagenode.hxx
@@ -27,7 +27,6 @@ namespace svgio::svgreader
class SvgFeImageNode final : public SvgFilterNode
{
private:
- OUString maIn;
OUString maResult;
OUString maUrl; // external link
OUString maData; // base64 data
diff --git a/svgio/source/svgreader/svgfefloodnode.cxx
b/svgio/source/svgreader/svgfefloodnode.cxx
index ede285b6d756..8ac62d79c8d9 100644
--- a/svgio/source/svgreader/svgfefloodnode.cxx
+++ b/svgio/source/svgreader/svgfefloodnode.cxx
@@ -49,11 +49,6 @@ void SvgFeFloodNode::parseAttribute(SVGToken aSVGToken,
const OUString& aContent
readLocalCssStyle(aContent);
break;
}
- case SVGToken::In:
- {
- maIn = aContent.trim();
- break;
- }
case SVGToken::Result:
{
maResult = aContent.trim();
@@ -145,12 +140,6 @@ void
SvgFeFloodNode::apply(drawinglayer::primitive2d::Primitive2DContainer& rTar
if (fWidth <= 0.0 || fHeight <= 0.0)
return;
- if (const drawinglayer::primitive2d::Primitive2DContainer* rSource
- = pParent->findGraphicSource(maIn))
- {
- rTarget = *rSource;
- }
-
const double fX(maX.solve(*this, NumberType::xcoordinate));
const double fY(maY.solve(*this, NumberType::ycoordinate));
const basegfx::B2DRange aRange(fX, fY, fX + fWidth, fY + fHeight);
diff --git a/svgio/source/svgreader/svgfeimagenode.cxx
b/svgio/source/svgreader/svgfeimagenode.cxx
index c7b1f65b8f2d..6a7e5dd9d9c3 100644
--- a/svgio/source/svgreader/svgfeimagenode.cxx
+++ b/svgio/source/svgreader/svgfeimagenode.cxx
@@ -46,11 +46,6 @@ void SvgFeImageNode::parseAttribute(SVGToken aSVGToken,
const OUString& aContent
readLocalCssStyle(aContent);
break;
}
- case SVGToken::In:
- {
- maIn = aContent.trim();
- break;
- }
case SVGToken::Result:
{
maResult = aContent.trim();
@@ -79,12 +74,6 @@ void SvgFeImageNode::parseAttribute(SVGToken aSVGToken,
const OUString& aContent
void SvgFeImageNode::apply(drawinglayer::primitive2d::Primitive2DContainer&
rTarget,
const SvgFilterNode* pParent) const
{
- if (const drawinglayer::primitive2d::Primitive2DContainer* rSource
- = pParent->findGraphicSource(maIn))
- {
- rTarget = *rSource;
- }
-
BitmapEx aBitmapEx;
if (!maData.isEmpty())
