diff options
author | Armin Le Grand <alg@apache.org> | 2014-01-27 17:14:55 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-01-28 14:30:45 +0000 |
commit | fff58c3379ef03fb8dec51b7b64a053481d48727 (patch) | |
tree | 5dcf97979c042236e8caf8fe2cc6570b689dae54 /include/svx/svdhdl.hxx | |
parent | 655397f53d1244b7df00c17487ff3717eb804507 (diff) |
Resolves: #i123950# Corrected/extended interactive crop feature...
to work in all situations
(cherry picked from commit a440c753532e9ae1747ef3b3ed990d8b713913da)
Conflicts:
include/svx/sdr/overlay/overlaybitmapex.hxx
svx/source/svdraw/svddrgm1.hxx
svx/source/svdraw/svddrgmt.cxx
svx/source/svdraw/svdmrkv.cxx
svx/source/svdraw/svdograf.cxx
Change-Id: I33601a429657965fcc9b18da85aa5ffabad65983
Diffstat (limited to 'include/svx/svdhdl.hxx')
-rw-r--r-- | include/svx/svdhdl.hxx | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 599ff9f3232c..fc7382d417a9 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -502,8 +502,18 @@ public: class SVX_DLLPUBLIC SdrCropHdl : public SdrHdl { +private: + // evtl. shear and rotation, equal to the object's one to allow adaption of + // the visualization handles + double mfShearX; + double mfRotation; + public: - SdrCropHdl(const Point& rPnt, SdrHdlKind eNewKind); + SdrCropHdl( + const Point& rPnt, + SdrHdlKind eNewKind, + double fShearX, + double fRotation); protected: // create marker for this kind @@ -526,11 +536,6 @@ private: double mfCropRight; double mfCropBottom; - // Argh! The old geometry stuff expresses Y-Mirror using 180 degree rotaton - // and the bMirrored bool at the SdrGrafObj, so for now I have to give - // this info here. I am sooo looking forward to aw080 and real transformations :-( - bool mbExtraMirrorXFromGraphic; - public: SdrCropViewHdl( const basegfx::B2DHomMatrix& rObjectTransform, @@ -538,8 +543,7 @@ public: double fCropLeft, double fCropTop, double fCropRight, - double fCropBottom, - bool bExtraMirrorXFromGraphic); + double fCropBottom); protected: // create marker for this kind |