diff options
author | Oliver-Rainer Wittmann <orw@apache.org> | 2013-08-21 09:39:21 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-08-21 13:20:46 +0100 |
commit | 199eb7607cfb02ce9a68bff22c37aca91a8e9fb8 (patch) | |
tree | fae747e4e124eaeeec402c6e2361d9bc5164ce8b /svgio/inc | |
parent | 172c37522bca256b1d0bd9f966d06f49845ba102 (diff) |
Related: #i122600# access memory problem in SvgSvgNode::getCurrentViewPort
(cherry picked from commit d41dc0bbe76922fee4ce177ecac0d84b9efc4206)
Conflicts:
svgio/inc/svgio/svgreader/svgnode.hxx
svgio/inc/svgio/svgreader/svgtools.hxx
Change-Id: Ie4d5cd29461845edb5b8a57fe639302947d80ebd
Diffstat (limited to 'svgio/inc')
-rw-r--r-- | svgio/inc/svgio/svgreader/svgmarkernode.hxx | 2 | ||||
-rw-r--r-- | svgio/inc/svgio/svgreader/svgnode.hxx | 2 | ||||
-rw-r--r-- | svgio/inc/svgio/svgreader/svgpatternnode.hxx | 2 | ||||
-rw-r--r-- | svgio/inc/svgio/svgreader/svgsvgnode.hxx | 2 | ||||
-rw-r--r-- | svgio/inc/svgio/svgreader/svgtools.hxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/svgio/inc/svgio/svgreader/svgmarkernode.hxx b/svgio/inc/svgio/svgreader/svgmarkernode.hxx index 14fa5f14082b..0112f3a376f7 100644 --- a/svgio/inc/svgio/svgreader/svgmarkernode.hxx +++ b/svgio/inc/svgio/svgreader/svgmarkernode.hxx @@ -71,7 +71,7 @@ namespace svgio const drawinglayer::primitive2d::Primitive2DSequence& getMarkerPrimitives() const; /// InfoProvider support for % values - virtual const basegfx::B2DRange* getCurrentViewPort() const; + virtual const basegfx::B2DRange getCurrentViewPort() const; /// viewBox content const basegfx::B2DRange* getViewBox() const { return mpViewBox; } diff --git a/svgio/inc/svgio/svgreader/svgnode.hxx b/svgio/inc/svgio/svgreader/svgnode.hxx index 7c1c39b968d9..a76c18b2c37b 100644 --- a/svgio/inc/svgio/svgreader/svgnode.hxx +++ b/svgio/inc/svgio/svgreader/svgnode.hxx @@ -134,7 +134,7 @@ namespace svgio const SvgNodeVector& getChildren() const { return maChildren; } /// InfoProvider support for %, em and ex values - virtual const basegfx::B2DRange* getCurrentViewPort() const SAL_OVERRIDE; + virtual const basegfx::B2DRange getCurrentViewPort() const SAL_OVERRIDE; virtual double getCurrentFontSizeInherited() const SAL_OVERRIDE; virtual double getCurrentXHeightInherited() const SAL_OVERRIDE; diff --git a/svgio/inc/svgio/svgreader/svgpatternnode.hxx b/svgio/inc/svgio/svgreader/svgpatternnode.hxx index e70abce816dd..ecb9ec1e5ea1 100644 --- a/svgio/inc/svgio/svgreader/svgpatternnode.hxx +++ b/svgio/inc/svgio/svgreader/svgpatternnode.hxx @@ -74,7 +74,7 @@ namespace svgio const drawinglayer::primitive2d::Primitive2DSequence& getPatternPrimitives() const; /// InfoProvider support for % values - virtual const basegfx::B2DRange* getCurrentViewPort() const; + virtual const basegfx::B2DRange getCurrentViewPort() const; /// viewBox content const basegfx::B2DRange* getViewBox() const; diff --git a/svgio/inc/svgio/svgreader/svgsvgnode.hxx b/svgio/inc/svgio/svgreader/svgsvgnode.hxx index 7226d7fcfc27..8455b7c94876 100644 --- a/svgio/inc/svgio/svgreader/svgsvgnode.hxx +++ b/svgio/inc/svgio/svgreader/svgsvgnode.hxx @@ -62,7 +62,7 @@ namespace svgio // The returned 'CurrentViewPort' is the viewport as it is set by this svg element // and as it is needed to resolve relative values in childs // The method does not check for invalid width and height - virtual const basegfx::B2DRange* getCurrentViewPort() const; + virtual const basegfx::B2DRange getCurrentViewPort() const; /// viewBox content const basegfx::B2DRange* getViewBox() const { return mpViewBox; } diff --git a/svgio/inc/svgio/svgreader/svgtools.hxx b/svgio/inc/svgio/svgreader/svgtools.hxx index 8a808b29b976..c6ede61a1145 100644 --- a/svgio/inc/svgio/svgreader/svgtools.hxx +++ b/svgio/inc/svgio/svgreader/svgtools.hxx @@ -66,7 +66,7 @@ namespace svgio { public: virtual ~InfoProvider() {} - virtual const basegfx::B2DRange* getCurrentViewPort() const = 0; + virtual const basegfx::B2DRange getCurrentViewPort() const = 0; /// return font size of node inherited from parents virtual double getCurrentFontSizeInherited() const = 0; /// return xheight of node inherited from parents |