diff options
| author | Regina Henschel <rb.henschel@t-online.de> | 2018-12-15 17:51:25 +0100 |
|---|---|---|
| committer | Regina Henschel <rb.henschel@t-online.de> | 2018-12-23 22:42:11 +0100 |
| commit | a4c46ceec433edf0c5de03ea8d36857a455cafd2 (patch) | |
| tree | f91219d16a75f38f27c3910e0e0aeaa52c04e796 /include/svx | |
| parent | 721bc6dafbed2185a9aedae35a34d3395eaed0bc (diff) | |
tdf#121761, tdf#121952 Accurate ellipsequadrant in custom shape
The current solution uses one, bad valued Bezier curve and does not
toggle direction. The patch uses the more accurate solution from
basegfx and simplifies the decision tree. In addition it extracts the
calculation in double from GetPoint, so they can be used directly
instead of double->long->double conversion.
Change-Id: I298f49415d1b7624b36ca561647f2e58af5eb5c6
Reviewed-on: https://gerrit.libreoffice.org/65203
Tested-by: Jenkins
Reviewed-by: Regina Henschel <rb.henschel@t-online.de>
Diffstat (limited to 'include/svx')
| -rw-r--r-- | include/svx/EnhancedCustomShape2d.hxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index b2864076469b..7b3508313651 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -35,6 +35,7 @@ #include <svx/EnhancedCustomShapeFunctionParser.hxx> #include <tools/gen.hxx> #include <o3tl/typed_flags_set.hxx> +#include <basegfx/point/b2dpoint.hxx> #include <memory> #include <vector> @@ -132,6 +133,8 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet sal_uInt32 nColorCount); SAL_DLLPRIVATE Point GetPoint( const css::drawing::EnhancedCustomShapeParameterPair&, const bool bScale = true, const bool bReplaceGeoSize = false ) const; + SAL_DLLPRIVATE basegfx::B2DPoint GetPointAsB2DPoint(const css::drawing::EnhancedCustomShapeParameterPair&, + const bool bScale = true, const bool bReplaceGeoSize = false ) const; SAL_DLLPRIVATE void CreateSubPath( sal_Int32& rSrcPt, |