diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
| commit | c61cd1a5a26de1d1f62389988b00229c04e36693 (patch) | |
| tree | 9d6de00f4d149cba080fe88f1eff71a67786b5f0 /sd/source/filter/ppt/ppt97animations.hxx | |
| parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
| parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/filter/ppt/ppt97animations.hxx')
| -rw-r--r-- | sd/source/filter/ppt/ppt97animations.hxx | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx index 64e10250a53c..705f42978a50 100644 --- a/sd/source/filter/ppt/ppt97animations.hxx +++ b/sd/source/filter/ppt/ppt97animations.hxx @@ -41,22 +41,22 @@ class Ppt97AnimationInfoAtom friend class Ppt97Animation; //-- member - UINT32 nDimColor; - UINT32 nFlags; // 0x0004: time instead of click - UINT32 nSoundRef; - INT32 nDelayTime; // 1/1000 sec - UINT16 nOrderID; - UINT16 nSlideCount; - UINT8 nBuildType; - UINT8 nFlyMethod; - UINT8 nFlyDirection; - UINT8 nAfterEffect; //nAfterEffect: 0: none; 1: change color; 2: dim on next effect; 3: dim after effect; - UINT8 nSubEffect; - UINT8 nOLEVerb; + sal_uInt32 nDimColor; + sal_uInt32 nFlags; // 0x0004: time instead of click + sal_uInt32 nSoundRef; + sal_Int32 nDelayTime; // 1/1000 sec + sal_uInt16 nOrderID; + sal_uInt16 nSlideCount; + sal_uInt8 nBuildType; + sal_uInt8 nFlyMethod; + sal_uInt8 nFlyDirection; + sal_uInt8 nAfterEffect; //nAfterEffect: 0: none; 1: change color; 2: dim on next effect; 3: dim after effect; + sal_uInt8 nSubEffect; + sal_uInt8 nOLEVerb; // unknown, because whole size needs to be 28 - UINT8 nUnknown1; - UINT8 nUnknown2; + sal_uInt8 nUnknown1; + sal_uInt8 nUnknown2; //-- methods void ReadStream( SvStream& rIn ); @@ -107,7 +107,7 @@ public: //public methods bool HasParagraphEffect() const; bool HasSoundEffect() const; sal_Int32 GetDimColor() const; - UINT32 GetSoundRef() const; + sal_uInt32 GetSoundRef() const; bool HasAnimateAssociatedShape() const; //true if the shape should be animated in addition to the text //set methods |