diff options
| author | Mark Hung <marklh9@gmail.com> | 2019-11-18 00:49:03 +0800 |
|---|---|---|
| committer | Mark Hung <marklh9@gmail.com> | 2019-11-30 15:00:09 +0100 |
| commit | d86cfcaf709638d73fcb0de5067b902dab7a7f2f (patch) | |
| tree | 9306bca1007d5888e76c608f2fd1103704761623 /sd/inc | |
| parent | aeed331f7307612fbc4ebac4764cd39f6f2352e9 (diff) | |
tdf#94947 Set preset-id for user defined motion paths.
User defined motion paths ( curve, polygon, freeform line )
did not have preset-id. Set the preset-id so that the
preset type will be highlighted in the custom animation
pane after editing.
"libo-motionpath-curve", "libo-motionpath-polygon",
and "libo-motionpath-freeform-line" are used for the three
user defined motion paths.
This patch is related to tdf#94947, though it doesn't
make the original document display correctly by guessing
the missing preset-id, but it prevent empty preset-id
to be generated when creating those three motion path
animation.
Change-Id: I50c0133bea32e022b07e5d8c0a024810844f124d
Reviewed-on: https://gerrit.libreoffice.org/83079
Tested-by: Jenkins
Reviewed-by: Mark Hung <marklh9@gmail.com>
Diffstat (limited to 'sd/inc')
| -rw-r--r-- | sd/inc/CustomAnimationEffect.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx index cf2cfe7cb7a4..962ce9b995d9 100644 --- a/sd/inc/CustomAnimationEffect.hxx +++ b/sd/inc/CustomAnimationEffect.hxx @@ -71,7 +71,7 @@ public: SAL_DLLPRIVATE const OUString& getProperty() const { return maProperty; } SAL_DLLPRIVATE sal_Int16 getPresetClass() const { return mnPresetClass; } - SAL_DLLPRIVATE void setPresetClass( sal_Int16 nPresetClass ); + SAL_DLLPRIVATE void setPresetClassAndId( sal_Int16 nPresetClass, const OUString& rPresetId ); SAL_DLLPRIVATE sal_Int16 getNodeType() const { return mnNodeType; } void setNodeType( sal_Int16 nNodeType ); @@ -271,7 +271,7 @@ public: SAL_DLLPRIVATE virtual css::uno::Reference< css::animations::XAnimationNode > getRootNode(); SAL_DLLPRIVATE CustomAnimationEffectPtr append( const CustomAnimationPresetPtr& pDescriptor, const css::uno::Any& rTarget, double fDuration ); - SAL_DLLPRIVATE CustomAnimationEffectPtr append( const SdrPathObj& rPathObj, const css::uno::Any& rTarget, double fDuration ); + SAL_DLLPRIVATE CustomAnimationEffectPtr append( const SdrPathObj& rPathObj, const css::uno::Any& rTarget, double fDuration, const OUString& rPresetId ); void append( const CustomAnimationEffectPtr& pEffect ); SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, double fDuration ); SAL_DLLPRIVATE void replace( const CustomAnimationEffectPtr& pEffect, const CustomAnimationPresetPtr& pDescriptor, const OUString& rPresetSubType, double fDuration ); |