diff options
Diffstat (limited to 'svgio')
| -rw-r--r-- | svgio/inc/svgio/svgreader/svgclippathnode.hxx | 6 | ||||
| -rw-r--r-- | svgio/inc/svgio/svgreader/svgmasknode.hxx | 6 | ||||
| -rw-r--r-- | svgio/source/svgreader/svgclippathnode.cxx | 12 | ||||
| -rw-r--r-- | svgio/source/svgreader/svgmasknode.cxx | 17 | ||||
| -rw-r--r-- | svgio/source/svgreader/svgstyleattributes.cxx | 6 |
5 files changed, 39 insertions, 8 deletions
diff --git a/svgio/inc/svgio/svgreader/svgclippathnode.hxx b/svgio/inc/svgio/svgreader/svgclippathnode.hxx index e2fc7cb11f5c..5cf4e711c82d 100644 --- a/svgio/inc/svgio/svgreader/svgclippathnode.hxx +++ b/svgio/inc/svgio/svgreader/svgclippathnode.hxx @@ -52,8 +52,10 @@ namespace svgio virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; - /// apply contained clipPath to given geometry - void apply(drawinglayer::primitive2d::Primitive2DSequence& rTarget) const; + /// apply contained clipPath to given geometry #i124852# transform may be needed + void apply( + drawinglayer::primitive2d::Primitive2DSequence& rTarget, + const basegfx::B2DHomMatrix* pTransform) const; /// clipPathUnits content SvgUnits getClipPathUnits() const { return maClipPathUnits; } diff --git a/svgio/inc/svgio/svgreader/svgmasknode.hxx b/svgio/inc/svgio/svgreader/svgmasknode.hxx index 6c3089d4a107..4c5fa5fcf5e1 100644 --- a/svgio/inc/svgio/svgreader/svgmasknode.hxx +++ b/svgio/inc/svgio/svgreader/svgmasknode.hxx @@ -57,8 +57,10 @@ namespace svgio virtual void parseAttribute(const rtl::OUString& rTokenName, SVGToken aSVGToken, const rtl::OUString& aContent); virtual void decomposeSvgNode(drawinglayer::primitive2d::Primitive2DSequence& rTarget, bool bReferenced) const; - /// apply contained clipPath to given geometry - void apply(drawinglayer::primitive2d::Primitive2DSequence& rTarget) const; + /// apply contained clipPath to given geometry #i124852# transform may be needed + void apply( + drawinglayer::primitive2d::Primitive2DSequence& rTarget, + const basegfx::B2DHomMatrix* pTransform) const; /// x content, set if found in current context const SvgNumber& getX() const { return maX; } diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx index 4e795ff1f179..3e4ecd806f3d 100644 --- a/svgio/source/svgreader/svgclippathnode.cxx +++ b/svgio/source/svgreader/svgclippathnode.cxx @@ -132,7 +132,9 @@ namespace svgio } } - void SvgClipPathNode::apply(drawinglayer::primitive2d::Primitive2DSequence& rContent) const + void SvgClipPathNode::apply( + drawinglayer::primitive2d::Primitive2DSequence& rContent, + const basegfx::B2DHomMatrix* pTransform) const { if(rContent.hasElements() && Display_none != getDisplay()) { @@ -179,6 +181,14 @@ namespace svgio aContentRange.getRange(), aContentRange.getMinimum())); } + else // userSpaceOnUse + { + // #i124852# + if(pTransform) + { + aClipPolyPolygon.transform(*pTransform); + } + } // #124313# try to avoid creating an embedding to a MaskPrimitive2D if // possible; MaskPrimitive2D processing is potentially expensive diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx index 26e28f5e42a1..37459afd7cd9 100644 --- a/svgio/source/svgreader/svgmasknode.cxx +++ b/svgio/source/svgreader/svgmasknode.cxx @@ -197,7 +197,9 @@ namespace svgio } } - void SvgMaskNode::apply(drawinglayer::primitive2d::Primitive2DSequence& rTarget) const + void SvgMaskNode::apply( + drawinglayer::primitive2d::Primitive2DSequence& rTarget, + const basegfx::B2DHomMatrix* pTransform) const { if(rTarget.hasElements() && Display_none != getDisplay()) { @@ -259,6 +261,19 @@ namespace svgio aMaskTarget = drawinglayer::primitive2d::Primitive2DSequence(&xTransform, 1); } + else // userSpaceOnUse + { + // #i124852# + if(pTransform) + { + const drawinglayer::primitive2d::Primitive2DReference xTransform( + new drawinglayer::primitive2d::TransformPrimitive2D( + *pTransform, + aMaskTarget)); + + aMaskTarget = drawinglayer::primitive2d::Primitive2DSequence(&xTransform, 1); + } + } // embed content to a ModifiedColorPrimitive2D since the definitions // how content is used as alpha is special for Svg diff --git a/svgio/source/svgreader/svgstyleattributes.cxx b/svgio/source/svgreader/svgstyleattributes.cxx index 0e5ecd1a3567..f691fc6cfff7 100644 --- a/svgio/source/svgreader/svgstyleattributes.cxx +++ b/svgio/source/svgreader/svgstyleattributes.cxx @@ -1130,7 +1130,8 @@ namespace svgio if(mpClip) { - mpClip->apply(aSource); + // #i124852# transform may be needed when userSpaceOnUse + mpClip->apply(aSource, pTransform); } } @@ -1143,7 +1144,8 @@ namespace svgio if(mpMask) { - mpMask->apply(aSource); + // #i124852# transform may be needed when userSpaceOnUse + mpMask->apply(aSource, pTransform); } } |