diff options
Diffstat (limited to 'svgio/source/svgreader/svgellipsenode.cxx')
| -rw-r--r-- | svgio/source/svgreader/svgellipsenode.cxx | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/svgio/source/svgreader/svgellipsenode.cxx b/svgio/source/svgreader/svgellipsenode.cxx index c76b5c538c03..4454b9d696f2 100644 --- a/svgio/source/svgreader/svgellipsenode.cxx +++ b/svgio/source/svgreader/svgellipsenode.cxx @@ -129,29 +129,29 @@ namespace svgio { const SvgStyleAttributes* pStyle = getSvgStyleAttributes(); - if(pStyle && getRx().isSet() && getRy().isSet()) - { - const double fRx(getRx().solve(*this, xcoordinate)); - const double fRy(getRy().solve(*this, ycoordinate)); + if(!(pStyle && getRx().isSet() && getRy().isSet())) + return; - if(fRx > 0.0 && fRy > 0.0) - { - const basegfx::B2DPolygon aPath( - basegfx::utils::createPolygonFromEllipse( - basegfx::B2DPoint( - getCx().isSet() ? getCx().solve(*this, xcoordinate) : 0.0, - getCy().isSet() ? getCy().solve(*this, ycoordinate) : 0.0), - fRx, fRy)); + const double fRx(getRx().solve(*this, xcoordinate)); + const double fRy(getRy().solve(*this, ycoordinate)); - drawinglayer::primitive2d::Primitive2DContainer aNewTarget; + if(!(fRx > 0.0 && fRy > 0.0)) + return; - pStyle->add_path(basegfx::B2DPolyPolygon(aPath), aNewTarget, nullptr); + const basegfx::B2DPolygon aPath( + basegfx::utils::createPolygonFromEllipse( + basegfx::B2DPoint( + getCx().isSet() ? getCx().solve(*this, xcoordinate) : 0.0, + getCy().isSet() ? getCy().solve(*this, ycoordinate) : 0.0), + fRx, fRy)); - if(!aNewTarget.empty()) - { - pStyle->add_postProcess(rTarget, aNewTarget, getTransform()); - } - } + drawinglayer::primitive2d::Primitive2DContainer aNewTarget; + + pStyle->add_path(basegfx::B2DPolyPolygon(aPath), aNewTarget, nullptr); + + if(!aNewTarget.empty()) + { + pStyle->add_postProcess(rTarget, aNewTarget, getTransform()); } } } // end of namespace svgreader |