summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorArmin Le Grand <Armin.Le.Grand@cib.de>2017-11-15 13:56:38 +0100
committerArmin Le Grand <Armin.Le.Grand@cib.de>2017-11-18 13:07:46 +0100
commitd74b26b41bfea3ba7a1834953b2bfe9b7ff0d70f (patch)
tree9e9684d1481df209e585ab08b079de5bfa86a466 /include
parent1059e234f4b3b3f6b770b2e4d973923e54e7045b (diff)
RotateFlyFrame3: Corrected interactive Crop
To correct interactive Crop in transformed states, I had to rework some stuff involved that anyways was in a non optimal state. Added functionality to translate the object to make Crop seem to work more seamlessly. Some mapping was needed to make the Cropped, transformed object to be in the correct relative position to the uncropped, untransfomed one. Restructured TransformableSwFrame to directly re-create last non-transformed SwFrame(s) from the SwFrameAreaDefinition from the current Transformations, offering the untransformed SwRect(s) now for usage. Identified and corrected error when FlyFrame was translated using keyboard, the accessing method needed to adapt position in the transformed case. Started to look at Contour stuff, adapted a set contour to be correctly used by adapting it as needed in the transformed case. Change-Id: I0d5f14958bcd6f826b9abd53f1f47b7d0bc5a0e2
Diffstat (limited to 'include')
-rw-r--r--include/svx/svdobj.hxx7
1 files changed, 3 insertions, 4 deletions
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 2a7c629a05d3..bf227c9635c4 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -75,10 +75,9 @@ class OutputDevice;
class Fraction;
namespace basegfx {
-
+class B2DPoint;
class B2DPolyPolygon;
class B2DHomMatrix;
-
}
namespace sdr
@@ -511,14 +510,14 @@ public:
/// Nbc means "no broadcast".
virtual void NbcMove (const Size& rSiz);
virtual void NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact);
- virtual void NbcCrop (const Point& rRef, const Fraction& xFact, const Fraction& yFact);
+ virtual void NbcCrop (const basegfx::B2DPoint& rRef, double fxFact, double fyFact);
virtual void NbcRotate(const Point& rRef, long nAngle, double sn, double cs);
virtual void NbcMirror(const Point& rRef1, const Point& rRef2);
virtual void NbcShear (const Point& rRef, long nAngle, double tn, bool bVShear);
virtual void Move (const Size& rSiz);
virtual void Resize(const Point& rRef, const Fraction& xFact, const Fraction& yFact, bool bUnsetRelative = true);
- virtual void Crop (const Point& rRef, const Fraction& xFact, const Fraction& yFact);
+ virtual void Crop (const basegfx::B2DPoint& rRef, double fxFact, double fyFact);
virtual void Rotate(const Point& rRef, long nAngle, double sn, double cs);
virtual void Mirror(const Point& rRef1, const Point& rRef2);
virtual void Shear (const Point& rRef, long nAngle, double tn, bool bVShear);