summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2020-12-19 21:38:55 +0800
committerXisco Fauli <xiscofauli@libreoffice.org>2020-12-29 13:39:01 +0100
commit3c44c403791754207142c60183a118c323b9c297 (patch)
treea899570e5950b4f3a95679abef3b8a4316e73734
parent48038c2a2bf5a6e9c49407038bb60f8900c4b58a (diff)
tdf#138937 don't use attributes that depend on preset data
if preset data is not found. Curve, polygon, and free form motion paths do not have preset data. Create the path in these cases as well. Change-Id: Idd3b24b81a15de53e302e8cb7f3636d72e10b4da Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108022 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com> (cherry picked from commit 765b13b67e46aa8c8618fdad8582f8586bffce9e) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108295 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx20
1 files changed, 14 insertions, 6 deletions
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 2e6d511253ee..b58ca838b709 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1815,14 +1815,14 @@ void CustomAnimationPane::onAdd()
if (nEntryData)
pDescriptor = *reinterpret_cast<CustomAnimationPresetPtr*>(nEntryData);
- const double fDuration = pDescriptor->getDuration();
- mxCBXDuration->set_value(fDuration*100.0, FieldUnit::NONE);
- bool bHasSpeed = pDescriptor->getDuration() > 0.001;
- mxCBXDuration->set_sensitive( bHasSpeed );
- mxFTDuration->set_sensitive( bHasSpeed );
-
if( pDescriptor )
{
+ const double fDuration = pDescriptor->getDuration();
+ mxCBXDuration->set_value(fDuration*100.0, FieldUnit::NONE);
+ bool bHasSpeed = pDescriptor->getDuration() > 0.001;
+ mxCBXDuration->set_sensitive( bHasSpeed );
+ mxFTDuration->set_sensitive( bHasSpeed );
+
mxCustomAnimationList->unselect_all();
// gather shapes from the selection
@@ -1851,6 +1851,14 @@ void CustomAnimationPane::onAdd()
}
}
+ PathKind ePathKind = getCreatePathKind();
+
+ if (ePathKind != PathKind::NONE)
+ {
+ createPath( ePathKind, aTargets, 0.0 );
+ updateMotionPathTags();
+ }
+
mrBase.GetDocShell()->SetModified();
updateControls();