diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-05-03 16:19:51 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-09-05 09:08:21 +0200 |
| commit | b6d2d10b8b2de89b1a856b8e164c0defcb2119ff (patch) | |
| tree | a21f13cc4a58b81c6eaf5c249b0d4330bbf1638a /svx | |
| parent | 6fa04518078b8403d8ca30b99233d8280c4b9a98 (diff) | |
tdf#81134 Chart size not retained
Change-Id: I39019e29a988b7b9e12505537fdb69d83223600d
Reviewed-on: https://gerrit.libreoffice.org/75329
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/78422
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/sdr/contact/viewcontactofgroup.cxx | 6 | ||||
| -rw-r--r-- | svx/source/sdr/contact/viewcontactofsdrrectobj.cxx | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/svx/source/sdr/contact/viewcontactofgroup.cxx b/svx/source/sdr/contact/viewcontactofgroup.cxx index d6a0e98dfcfe..cc82432aaea6 100644 --- a/svx/source/sdr/contact/viewcontactofgroup.cxx +++ b/svx/source/sdr/contact/viewcontactofgroup.cxx @@ -27,6 +27,7 @@ #include <basegfx/color/bcolor.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> +#include <vcl/canvastools.hxx> namespace sdr @@ -76,10 +77,7 @@ namespace sdr // to current zoom so as objects relative position to grid // appears stable aCurrentBoundRect += GetSdrObjGroup().GetGridOffset(); - const basegfx::B2DRange aCurrentRange( - aCurrentBoundRect.Left(), aCurrentBoundRect.Top(), - aCurrentBoundRect.Right(), aCurrentBoundRect.Bottom()); - + const basegfx::B2DRange aCurrentRange = vcl::unotools::b2DRectangleFromRectangle(aCurrentBoundRect); const drawinglayer::primitive2d::Primitive2DReference xReference( drawinglayer::primitive2d::createHiddenGeometryPrimitives2D( false, aCurrentRange)); diff --git a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx index f02ba917280c..0ada135b8766 100644 --- a/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrrectobj.cxx @@ -25,6 +25,7 @@ #include <sdr/primitive2d/sdrprimitivetools.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <svx/svdmodel.hxx> +#include <vcl/canvastools.hxx> namespace sdr { namespace contact { @@ -52,9 +53,7 @@ drawinglayer::primitive2d::Primitive2DContainer ViewContactOfSdrRectObj::createV // to current zoom so as objects relative position to grid // appears stable rRectangle += GetRectObj().GetGridOffset(); - const ::basegfx::B2DRange aObjectRange( - rRectangle.Left(), rRectangle.Top(), - rRectangle.Right(), rRectangle.Bottom() ); + const ::basegfx::B2DRange aObjectRange = vcl::unotools::b2DRectangleFromRectangle(rRectangle); const GeoStat& rGeoStat(GetRectObj().GetGeoStat()); |