diff options
| author | Mark Hung <marklh9@gmail.com> | 2019-02-24 13:09:28 +0800 |
|---|---|---|
| committer | Mark Hung <marklh9@gmail.com> | 2019-02-25 01:30:19 +0100 |
| commit | df8629e14f522d9116d81bdc09dad4b438e4e2cf (patch) | |
| tree | 89c746982bf87673dc2d13562ed39ae31b0f336b | |
| parent | 7927bfcf46aaaee8a5ab4eeb10549436416cfc3a (diff) | |
sd: fix preset class for media call effects.
Change-Id: I2a2a72a3a19beb9911fa694e983945480029ae0d
Reviewed-on: https://gerrit.libreoffice.org/68276
Tested-by: Jenkins
Reviewed-by: Mark Hung <marklh9@gmail.com>
| -rw-r--r-- | sd/inc/strings.hrc | 1 | ||||
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationList.cxx | 2 | ||||
| -rw-r--r-- | sd/xml/effects.xml | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc index c0d6631d5b19..02f709408d72 100644 --- a/sd/inc/strings.hrc +++ b/sd/inc/strings.hrc @@ -442,6 +442,7 @@ #define STR_CUSTOMANIMATION_EMPHASIS NC_("STR_CUSTOMANIMATION_EMPHASIS", "Emphasis: %1") #define STR_CUSTOMANIMATION_EXIT NC_("STR_CUSTOMANIMATION_EXIT", "Exit: %1") #define STR_CUSTOMANIMATION_MOTION_PATHS NC_("STR_CUSTOMANIMATION_MOTION_PATHS", "Motion Paths: %1") +#define STR_CUSTOMANIMATION_MISC NC_("STR_CUSTOMANIMATION_MISC", "Misc: %1") #define STR_SLIDETRANSITION_NONE NC_("STR_SLIDETRANSITION_NONE", "None") #define STR_ANNOTATION_TODAY NC_("STR_ANNOTATION_TODAY", "Today," ) diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx index d3f88d483f1d..a3c210d55013 100644 --- a/sd/source/ui/animations/CustomAnimationList.cxx +++ b/sd/source/ui/animations/CustomAnimationList.cxx @@ -253,6 +253,8 @@ CustomAnimationListEntryItem::CustomAnimationListEntryItem( const OUString& aDes msEffectName = SdResId(STR_CUSTOMANIMATION_EMPHASIS); break; case EffectPresetClass::MOTIONPATH: msEffectName = SdResId(STR_CUSTOMANIMATION_MOTION_PATHS); break; + default: + msEffectName = SdResId(STR_CUSTOMANIMATION_MISC); break; } msEffectName = msEffectName.replaceFirst( "%1" , CustomAnimationPresets::getCustomAnimationPresets().getUINameForPresetId(mpEffect->getPresetId())); } diff --git a/sd/xml/effects.xml b/sd/xml/effects.xml index b7789383ed27..393ad5d50263 100644 --- a/sd/xml/effects.xml +++ b/sd/xml/effects.xml @@ -2641,21 +2641,21 @@ </anim:par> <anim:par smil:begin="indefinite" smil:fill="hold"> <anim:par smil:begin="0" smil:fill="hold"> - <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="entrance" pres:preset-id="ooo-media-start"> + <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="media-call" pres:preset-id="ooo-media-start"> <anim:command smil:begin="0" smil:dur="0.001" smil:fill="hold" anim:command="play"/> </anim:par> </anim:par> </anim:par> <anim:par smil:begin="indefinite" smil:fill="hold"> <anim:par smil:begin="0" smil:fill="hold"> - <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="entrance" pres:preset-id="ooo-media-stop"> + <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="media-call" pres:preset-id="ooo-media-stop"> <anim:command smil:begin="0" smil:dur="0.001" smil:fill="hold" anim:command="stop"/> </anim:par> </anim:par> </anim:par> <anim:par smil:begin="indefinite" smil:fill="hold"> <anim:par smil:begin="0" smil:fill="hold"> - <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="entrance" pres:preset-id="ooo-media-toggle-pause"> + <anim:par smil:begin="0" smil:fill="hold" pres:node-type="on-click" pres:preset-class="media-call" pres:preset-id="ooo-media-toggle-pause"> <anim:command smil:begin="0" smil:dur="0.001" smil:fill="hold" anim:command="toggle-pause"/> </anim:par> </anim:par> |