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/sdr/overlay/overlayanimatedbitmapex.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/sdr/overlay/overlayanimatedbitmapex.hxx')
| -rw-r--r-- | include/svx/sdr/overlay/overlayanimatedbitmapex.hxx | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx index e895bfb71c15..5182f93a8f48 100644 --- a/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx +++ b/include/svx/sdr/overlay/overlayanimatedbitmapex.hxx @@ -45,6 +45,10 @@ namespace sdr // #i53216# added CursorBlinkTime (in ms) sal_uInt32 mnBlinkTime; + // optional shear and rotation + double mfShearX; + double mfRotation; + /// bitfield // Flag to remember which state to draw. Inited with false (0) bool mbOverlayState : 1; @@ -61,7 +65,9 @@ namespace sdr sal_uInt16 nCenX1 = 0, sal_uInt16 nCenY1 = 0, sal_uInt16 nCenX2 = 0, - sal_uInt16 nCenY2 = 0); + sal_uInt16 nCenY2 = 0, + double fShearX = 0.0, + double fRotation = 0.0); virtual ~OverlayAnimatedBitmapEx(); const BitmapEx& getBitmapEx1() const { return maBitmapEx1; } @@ -78,6 +84,10 @@ namespace sdr // execute event from base class ::sdr::animation::Event. Default // implementation does nothing and does not create a new event. virtual void Trigger(sal_uInt32 nTime); + + // get shearX and rotation + double getShearX() const { return mfShearX; } + double getRotation() const { return mfRotation; } }; } // end of namespace overlay } // end of namespace sdr |