summaryrefslogtreecommitdiff
path: root/include/oox
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2018-07-12 23:35:44 +0800
committerMark Hung <marklh9@gmail.com>2018-07-16 11:55:32 +0200
commitdf3168e84dc30b5cbe993ec41b521486736065a7 (patch)
treea54c1827bd6284b63ec4af8b4d4d7bfbdb83917e /include/oox
parent311131fca0242e9465f03b6b1267906790a385c8 (diff)
oox: enum MS_AttributeNames -> enum class AnimationAttributeEnum
It's the attribute enum for the target animation. Remove MS_ prefix since it is in oox::ppt namespace and prepend Animation to make the purpose more clear. Change-Id: I0b6bbaf30ae4e2cf1cb0f6d5d24ba9f31e0b0773 Reviewed-on: https://gerrit.libreoffice.org/57353 Tested-by: Jenkins Reviewed-by: Mark Hung <marklh9@gmail.com>
Diffstat (limited to 'include/oox')
-rw-r--r--include/oox/ppt/pptfilterhelpers.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/include/oox/ppt/pptfilterhelpers.hxx b/include/oox/ppt/pptfilterhelpers.hxx
index b84fefbf94f8..94ac025cb6c9 100644
--- a/include/oox/ppt/pptfilterhelpers.hxx
+++ b/include/oox/ppt/pptfilterhelpers.hxx
@@ -33,17 +33,17 @@ namespace com { namespace sun { namespace star {
namespace oox { namespace ppt {
// conversion of MS to OOo attributes.
- enum MS_AttributeNames
+ enum class AnimationAttributeEnum
{
- MS_PPT_X, MS_PPT_Y, MS_PPT_W, MS_PPT_H, MS_PPT_C, MS_R, MS_XSHEAR, MS_FILLCOLOR, MS_FILLTYPE,
- MS_STROKECOLOR, MS_STROKEON, MS_STYLECOLOR, MS_STYLEROTATION, MS_FONTWEIGHT,
- MS_STYLEUNDERLINE, MS_STYLEFONTFAMILY, MS_STYLEFONTSIZE, MS_STYLEFONTSTYLE,
- MS_STYLEVISIBILITY, MS_STYLEOPACITY, MS_UNKNOWN
+ PPT_X, PPT_Y, PPT_W, PPT_H, PPT_C, R, XSHEAR, FILLCOLOR, FILLTYPE,
+ STROKECOLOR, STROKEON, STYLECOLOR, STYLEROTATION, FONTWEIGHT,
+ STYLEUNDERLINE, STYLEFONTFAMILY, STYLEFONTSIZE, STYLEFONTSTYLE,
+ STYLEVISIBILITY, STYLEOPACITY, UNKNOWN
};
struct ImplAttributeNameConversion
{
- MS_AttributeNames meAttribute;
+ AnimationAttributeEnum meAttribute;
const char* mpMSName;
const char* mpAPIName;
};
@@ -86,7 +86,7 @@ namespace oox { namespace ppt {
/** convert attribute values of the animation target so that LibreOffice understand.
*/
- OOX_DLLPUBLIC bool convertAnimationValue(MS_AttributeNames eAttribute, css::uno::Any& rValue);
+ OOX_DLLPUBLIC bool convertAnimationValue(AnimationAttributeEnum eAttribute, css::uno::Any& rValue);
/** convert the measure string to LibreOffice format.
* i.e. convert occurence of #{0,1}ppt_[xywh] to x,y, width, height.