mirror of
https://github.com/LibreOffice/core.git
synced 2025-08-11 23:24:16 +00:00
svgio: feImage and feFlood don't support the in attribute
Added by mistake in b22039cff8
"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 <xiscofauli@libreoffice.org>
This commit is contained in:
@ -27,7 +27,6 @@ namespace svgio::svgreader
|
|||||||
class SvgFeFloodNode final : public SvgFilterNode
|
class SvgFeFloodNode final : public SvgFilterNode
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
OUString maIn;
|
|
||||||
OUString maResult;
|
OUString maResult;
|
||||||
SvgNumber maX;
|
SvgNumber maX;
|
||||||
SvgNumber maY;
|
SvgNumber maY;
|
||||||
|
@ -27,7 +27,6 @@ namespace svgio::svgreader
|
|||||||
class SvgFeImageNode final : public SvgFilterNode
|
class SvgFeImageNode final : public SvgFilterNode
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
OUString maIn;
|
|
||||||
OUString maResult;
|
OUString maResult;
|
||||||
OUString maUrl; // external link
|
OUString maUrl; // external link
|
||||||
OUString maData; // base64 data
|
OUString maData; // base64 data
|
||||||
|
@ -49,11 +49,6 @@ void SvgFeFloodNode::parseAttribute(SVGToken aSVGToken, const OUString& aContent
|
|||||||
readLocalCssStyle(aContent);
|
readLocalCssStyle(aContent);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case SVGToken::In:
|
|
||||||
{
|
|
||||||
maIn = aContent.trim();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case SVGToken::Result:
|
case SVGToken::Result:
|
||||||
{
|
{
|
||||||
maResult = aContent.trim();
|
maResult = aContent.trim();
|
||||||
@ -145,12 +140,6 @@ void SvgFeFloodNode::apply(drawinglayer::primitive2d::Primitive2DContainer& rTar
|
|||||||
if (fWidth <= 0.0 || fHeight <= 0.0)
|
if (fWidth <= 0.0 || fHeight <= 0.0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (const drawinglayer::primitive2d::Primitive2DContainer* rSource
|
|
||||||
= pParent->findGraphicSource(maIn))
|
|
||||||
{
|
|
||||||
rTarget = *rSource;
|
|
||||||
}
|
|
||||||
|
|
||||||
const double fX(maX.solve(*this, NumberType::xcoordinate));
|
const double fX(maX.solve(*this, NumberType::xcoordinate));
|
||||||
const double fY(maY.solve(*this, NumberType::ycoordinate));
|
const double fY(maY.solve(*this, NumberType::ycoordinate));
|
||||||
const basegfx::B2DRange aRange(fX, fY, fX + fWidth, fY + fHeight);
|
const basegfx::B2DRange aRange(fX, fY, fX + fWidth, fY + fHeight);
|
||||||
|
@ -46,11 +46,6 @@ void SvgFeImageNode::parseAttribute(SVGToken aSVGToken, const OUString& aContent
|
|||||||
readLocalCssStyle(aContent);
|
readLocalCssStyle(aContent);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case SVGToken::In:
|
|
||||||
{
|
|
||||||
maIn = aContent.trim();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case SVGToken::Result:
|
case SVGToken::Result:
|
||||||
{
|
{
|
||||||
maResult = aContent.trim();
|
maResult = aContent.trim();
|
||||||
@ -79,12 +74,6 @@ void SvgFeImageNode::parseAttribute(SVGToken aSVGToken, const OUString& aContent
|
|||||||
void SvgFeImageNode::apply(drawinglayer::primitive2d::Primitive2DContainer& rTarget,
|
void SvgFeImageNode::apply(drawinglayer::primitive2d::Primitive2DContainer& rTarget,
|
||||||
const SvgFilterNode* pParent) const
|
const SvgFilterNode* pParent) const
|
||||||
{
|
{
|
||||||
if (const drawinglayer::primitive2d::Primitive2DContainer* rSource
|
|
||||||
= pParent->findGraphicSource(maIn))
|
|
||||||
{
|
|
||||||
rTarget = *rSource;
|
|
||||||
}
|
|
||||||
|
|
||||||
BitmapEx aBitmapEx;
|
BitmapEx aBitmapEx;
|
||||||
|
|
||||||
if (!maData.isEmpty())
|
if (!maData.isEmpty())
|
||||||
|
Reference in New Issue
Block a user