summaryrefslogtreecommitdiffstats
path: root/sd/inc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-10-16 09:20:42 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-10-16 12:24:07 +0200
commitf3961ea18cf4f80d231f6bc63320af1454d1e7e9 (patch)
tree4f2b4267d5138753c4a4b5a00fd869e626f48d83 /sd/inc
parentResolves: tdf#119623 record group positions also for top cells (diff)
downloadcore-f3961ea18cf4f80d231f6bc63320af1454d1e7e9.tar.gz
core-f3961ea18cf4f80d231f6bc63320af1454d1e7e9.zip
tdf#120626 'rewind' doesn't stick when effect duration is changed
Change-Id: I1c65168b68bba2928030f89836d2b127655d6066 Reviewed-on: https://gerrit.libreoffice.org/61814 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd/inc')
-rw-r--r--sd/inc/CustomAnimationEffect.hxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index c18d1437e730..b70bbdd07f91 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -81,7 +81,7 @@ public:
SAL_DLLPRIVATE css::uno::Any getEnd() const;
SAL_DLLPRIVATE void setEnd( const css::uno::Any& rEnd );
- SAL_DLLPRIVATE sal_Int16 getFill() const;
+ SAL_DLLPRIVATE sal_Int16 getFill() const { return mnFill; }
SAL_DLLPRIVATE void setFill( sal_Int16 nFill );
SAL_DLLPRIVATE double getBegin() const { return mfBegin; }
@@ -176,6 +176,7 @@ private:
OUString maPresetSubType;
OUString maProperty;
sal_Int16 mnPresetClass;
+ sal_Int16 mnFill;
double mfBegin;
double mfDuration; // this is the maximum duration of the subeffects
double mfAbsoluteDuration; // this is the maximum duration of the subeffects including possible iterations