diff options
author | Armin Le Grand <alg@apache.org> | 2013-01-23 09:27:24 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-06-13 21:00:33 +0100 |
commit | 0061af795047deb92c4b43ec191ad6ffd97d0b64 (patch) | |
tree | 6cf5df0880e4dc5b2699926d57dfe6214bb7f746 /svgio/source/svgreader/svgmasknode.cxx | |
parent | f321d9519fc067977b003109373ad36a2fc4c97e (diff) |
Resolves: #i121656# Some more cleanups for SVG import
also const as const can
(cherry picked from commit bb9ad24b16add4888c4b1fadac5252b95a72f04f)
Conflicts:
svgio/inc/svgio/svgreader/svgstyleattributes.hxx
svgio/source/svgreader/svgstyleattributes.cxx
svgio/source/svgreader/svgtoken.cxx
Change-Id: If236eb8b1e0193c43229ea6dc496eb3a8fd20c42
Related: #i121656# removed const for return-by-value
(cherry picked from commit aa85e31b3162cd4b18c818bf0af1a854cb05c57d)
Conflicts:
svgio/inc/svgio/svgreader/svgstyleattributes.hxx
svgio/source/svgreader/svgstyleattributes.cxx
Change-Id: Ief43c478ea3000d114487918875e9a201dd827bc
Diffstat (limited to 'svgio/source/svgreader/svgmasknode.cxx')
-rw-r--r-- | svgio/source/svgreader/svgmasknode.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx index 831cf3990e9c..d0f3f29ee2eb 100644 --- a/svgio/source/svgreader/svgmasknode.cxx +++ b/svgio/source/svgreader/svgmasknode.cxx @@ -194,7 +194,7 @@ namespace svgio void SvgMaskNode::apply(drawinglayer::primitive2d::Primitive2DSequence& rTarget) const { - if(rTarget.hasElements()) + if(rTarget.hasElements() && Display_none != getDisplay()) { drawinglayer::primitive2d::Primitive2DSequence aMaskTarget; |